Glitch-Shrike/config/webpack
Thibaut Girka 4aa6aba6ee Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/services/remove_status_service.rb
  Conflict because we still handle the direct timeline.
  Took upstream changes, with that one extra function call.
- config/locales/ca.yml
  Conflict because theme names were updated.
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/oc.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/pl.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
2019-03-16 20:59:33 +01:00
..
rules Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 20:59:33 +01: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
translationRunner.js Upgrade yargs to v12.0 (#9862) 2019-03-15 03:53:38 +01:00