Thibaut Girka 5a158899bc 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
..
components	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
containers	fix isSubmitting prop case (#10785)	2019-05-19 18:41:41 +02:00
util	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
index.js	Add forceSingleColumn prop to <UI /> (#10807)	2019-05-23 01:35:22 +02:00