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
..
appearance	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
notifications	Change preferences page into appearance, notifications, and other (#10977)	2019-06-07 03:39:24 +02:00
other	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00