Thibaut Girka 91bef4759f 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
..
2017-05-08 15:56:00 +02:00
2018-09-13 03:44:08 +02:00
2017-09-19 03:27:08 +02:00
2018-01-28 22:48:09 +09:00
2018-01-22 14:20:58 +01:00
2017-12-08 01:59:44 +01:00
2017-04-21 19:15:25 +02:00
2018-01-18 07:00:23 +09:00
2018-01-28 22:48:09 +09:00
2018-01-27 08:51:03 +09:00
2018-02-01 07:33:54 +09:00
2017-05-08 15:56:00 +02:00
2018-01-28 22:48:09 +09:00
2017-12-08 01:59:44 +01:00
2018-01-28 22:48:09 +09:00
2018-01-09 20:30:28 +09:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-05-03 19:12:09 +09:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00
2018-09-13 03:44:08 +02:00