mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 07:05:11 +01:00
3160e050a9
Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. |
||
---|---|---|
.. | ||
base_controller.rb | ||
claims_controller.rb | ||
collections_controller.rb | ||
followers_synchronizations_controller.rb | ||
inboxes_controller.rb | ||
outboxes_controller.rb | ||
replies_controller.rb |