Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code		2019-09-18 17:25:56 +02:00
..
host_meta_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	2019-07-08 12:03:45 +02:00
keybase_proof_config_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-24 16:23:53 +02:00
webfinger_controller.rb	Fix webfinger response not returning 410 when account is suspended (#11869)	2019-09-17 14:58:02 +02:00