Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.		2020-01-04 23:04:42 +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
nodeinfo_controller.rb
webfinger_controller.rb