nyastodon/app/controllers/well_known
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 Fix uncaught unknown format errors in host meta controller (#12747) 2020-01-03 05:28:56 +01:00
keybase_proof_config_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-24 16:23:53 +02:00
nodeinfo_controller.rb Add a nodeinfo endpoint (#12002) 2019-09-29 21:31:51 +02:00
webfinger_controller.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00