mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-13 11:13:05 -05: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.