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

Browse Source

Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock

A lot of the conflicts come from updating webpack.

Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.

Ported glitch changes to webpack 4.x

...

This commit is contained in:

Thibaut Girka

2018-07-15 18:17:37 +02:00

parent 8e8491e1da 7a68608237

commit f26f1145ac

79 changed files with 3212 additions and 1803 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

4230

yarn.lock

File diff suppressed because it is too large Load Diff