Merge branch 'master' into glitch-soc/merge-upstream

Browse Source

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

...

This commit is contained in:

Thibaut Girka

2018-09-19 21:46:01 +02:00

parent 382cdd7f95 554f659f2a

commit 91bef4759f

274 changed files with 5666 additions and 4173 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4124

yarn.lock

File diff suppressed because it is too large Load Diff