mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-30 00:56:52 +00: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. |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| schema.rb | ||
| seeds.rb | ||