Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.		2020-06-30 23:00:20 +02:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-30 23:00:20 +02:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
oauth	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-30 23:00:20 +02:00
well_known	…
about_controller.rb	…
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
application_controller.rb	…
authorize_interactions_controller.rb	…
custom_css_controller.rb	…
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
home_controller.rb	…
instance_actors_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	…
media_controller.rb	Fix functional user requirements in whitelist mode (#14093)	2020-06-19 19:18:47 +02:00
media_proxy_controller.rb	Add customizable thumbnails for audio and video attachments (#14145)	2020-06-29 13:56:55 +02:00
public_timelines_controller.rb	…
relationships_controller.rb	…
remote_follow_controller.rb	…
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
shares_controller.rb	…
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00