Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
activitypub
admin	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
concerns
oauth
settings
well_known
about_controller.rb
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb
application_controller.rb
authorize_interactions_controller.rb
custom_css_controller.rb
directories_controller.rb
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	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
remote_follow_controller.rb
remote_interaction_controller.rb
shares_controller.rb
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
tags_controller.rb