1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-20 22:52:56 -05:00
Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream
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.
2020-11-08 14:20:35 +01:00
..
2020-10-12 16:33:49 +02:00