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
..
admin	Add order options to relationship manager UI (#10404)	2019-03-28 02:16:01 +01:00
settings
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
flashes_helper.rb
home_helper.rb
instance_helper.rb
jsonld_helper.rb
routing_helper.rb
settings_helper.rb
stream_entries_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00