mastodon/config/webpack
Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/configuration.js`:
  Upstream updated the `js-yaml` dependency, which changed how to call it.
  Those changes conflicted because that code is pretty different in glitch-soc
  which has to deal with its more complex theming system.
  Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
  Not really a conflict, just glitch-soc-specific dependencies textually too
  close to some dependencies updated upstream.
2021-01-06 18:08:06 +01:00
..
rules Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
configuration.js Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
development.js Bump webpack-merge from 4.2.2 to 5.0.9 (#14424) 2020-11-05 02:21:28 +09:00
generateLocalePacks.js
production.js Bump webpack-merge from 4.2.2 to 5.0.9 (#14424) 2020-11-05 02:21:28 +09:00
shared.js Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
tests.js Bump webpack-merge from 4.2.2 to 5.0.9 (#14424) 2020-11-05 02:21:28 +09:00
translationRunner.js Upgrade yargs to v12.0 (#9862) 2019-03-15 03:53:38 +01:00