Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		2021-07-08 16:17:19 +02: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	Fix anonymous access to outbox not being cached by the reverse proxy (#16458)	2021-07-03 21:13:47 +02:00