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
..
activitypub	…
admin	…
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
auth	…
concerns	…
oauth	…
settings	…
well_known	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
about_controller.rb	…
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	…
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
authorize_interactions_controller.rb	…
custom_css_controller.rb	…
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	…
following_accounts_controller.rb	…
home_controller.rb	…
instance_actors_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	…
public_timelines_controller.rb	…
relationships_controller.rb	…
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
shares_controller.rb	…
statuses_controller.rb	…
tags_controller.rb	…