Thibaut Girka ae5c237607 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		2018-09-19 21:46:01 +02:00
..
components	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
containers	Fix ctrl+enter not submitting toot when text cursor is composing image description (#8273)	2018-08-18 19:40:35 +02:00
util	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
index.js	Upgrade Babel to version 7.0.0 (#5925)	2018-09-14 17:59:48 +02:00