Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
host_meta_controller.rb	…
keybase_proof_config_controller.rb	…
nodeinfo_controller.rb	Add a nodeinfo endpoint (#12002)	2019-09-29 21:31:51 +02:00
webfinger_controller.rb	Fix webfinger response not returning 410 when account is suspended (#11869)	2019-09-17 14:58:02 +02:00