Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.		2020-01-20 18:31:11 +01:00
..
activitypub
admin	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-20 18:31:11 +01:00
api	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
concerns	Fix base64-encoded file uploads not being possible (#12748)	2020-01-04 01:54:07 +01:00
oauth	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
well_known	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01: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	2020-01-04 23:04:42 +01:00
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-01-04 23:04:42 +01:00
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +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-01-20 18:31:11 +01:00
remote_follow_controller.rb
remote_interaction_controller.rb
shares_controller.rb
statuses_controller.rb
tags_controller.rb