You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.		5 years ago
..
host_meta_controller.rb	…
keybase_proof_config_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
webfinger_controller.rb	Fix uncaught error when resource param is missing in Webfinger request (#11701)	5 years ago