Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml		2019-03-26 16:02:54 +01:00
..
activitypub	Do not try fetching keys of unknown accounts on a Delete from them (#10326)	2019-03-20 17:20:16 +01:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +01:00
auth	…
concerns	Mark the 410 gone response for suspended accounts as cachable (#10339)	2019-03-21 23:33:18 +01:00
oauth	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +01:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	…
following_accounts_controller.rb	…
home_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	…
remote_interaction_controller.rb	…
remote_unfollows_controller.rb	…
shares_controller.rb	…
statuses_controller.rb	…
stream_entries_controller.rb	…
tags_controller.rb	…