mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-13 15:58:50 +00:00
Conflicts: - `app/controllers/follower_accounts_controller.rb`: Upstream refactored a part of the code where glitch-soc has changed the code to potentially hide followers count. Adapt upstream's changes.