Thibaut Girka f26f1145ac 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		2018-07-16 14:50:42 +02:00
..
assets.js	…
babel.js	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
babel_external.js	Remove prop types from external libraries (#5304)	2017-10-10 18:44:51 +02:00
mark.js	…
sass.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-16 14:50:42 +02:00