This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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	…
keybase_proof_config_controller.rb	…
nodeinfo_controller.rb	…
webfinger_controller.rb	…