about summary refs log tree commit diff
path: root/nanobox/nginx-local.conf
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-07-15 18:17:37 +0200
committerThibaut Girka <thib@sitedethib.com>2018-07-16 14:50:42 +0200
commitf26f1145ac0fab4a657ee1fc784e824858601bd3 (patch)
tree3980b53a1440a8e6d4ee8c539668c3c190363017 /nanobox/nginx-local.conf
parent8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff)
parent7a686082370ad6d1c7a7d0ad331c22bf3e1fbede (diff)
Merge branch 'master' into glitch-soc/merge-upstream
 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
Diffstat (limited to 'nanobox/nginx-local.conf')
0 files changed, 0 insertions, 0 deletions