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
..
chewy
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
mailers
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
presenters
serializers	Raise exception when attempting to serialize local-only statuses	2019-05-30 09:04:12 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-19 21:53:44 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00