mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-18 16:11:42 +01:00
0437d70628
Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.