Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +02:00
..
activitypub	…
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
api	…
auth	…
concerns	…
oauth	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +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	2019-06-07 17:00:36 +02:00
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
authorize_interactions_controller.rb	…
custom_css_controller.rb	Fix login sometimes redirecting to paths that are not pages (#11019)	2019-06-10 12:28:13 +02:00
directories_controller.rb	…
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
home_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	Fix login sometimes redirecting to paths that are not pages (#11019)	2019-06-10 12:28:13 +02:00
media_controller.rb	Fix login sometimes redirecting to paths that are not pages (#11019)	2019-06-10 12:28:13 +02:00
media_proxy_controller.rb	Fix login sometimes redirecting to paths that are not pages (#11019)	2019-06-10 12:28:13 +02:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
stream_entries_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
tags_controller.rb	…