Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream ...

Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock

2019-06-03 14:54:30 +02:00

..

rules

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

2019-06-03 14:54:30 +02:00

configuration.js

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

2019-03-16 14:14:20 +01:00

development.js

Bump webpacker from 3.5.5 to 4.0.2 (#10277)

2019-03-15 15:05:31 +01:00

generateLocalePacks.js

…

production.js

perf: remove stats.json generation in webpack (#10290)

2019-03-16 11:23:54 +01:00

shared.js

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

2019-03-16 14:14:20 +01:00

test.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00

translationRunner.js

Upgrade yargs to v12.0 (#9862)

2019-03-15 03:53:38 +01:00