luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-10-21 23:15:19 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/well_known
History
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
..
host_meta_controller.rb
keybase_proof_config_controller.rb
nodeinfo_controller.rb
webfinger_controller.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00