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.		2019-08-30 13:38:41 +02:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
v2
web
base_controller.rb
oembed_controller.rb
proofs_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	2019-07-08 12:03:45 +02:00