Thibaut Girka c077cdaba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.		2020-11-12 22:13:57 +01:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
auth	…
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
oauth	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
well_known	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
about_controller.rb	…
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
application_controller.rb	…
authorize_interactions_controller.rb	…
custom_css_controller.rb	…
directories_controller.rb	…
emojis_controller.rb	…
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-03 17:28:54 +01:00
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
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-11-12 22:13:57 +01:00
remote_follow_controller.rb	…
remote_interaction_controller.rb	…
shares_controller.rb	…
statuses_controller.rb	…
tags_controller.rb	…