mirror of https://github.com/Siphonay/mastodon
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. |
||
|---|---|---|
| .. | ||
| host_meta_controller.rb | ||
| keybase_proof_config_controller.rb | ||
| nodeinfo_controller.rb | ||
| webfinger_controller.rb | ||