mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-12 06:06:22 +01:00
90528f43bc
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. |
||
---|---|---|
.. | ||
rules | ||
configuration.js | ||
development.js | ||
generateLocalePacks.js | ||
production.js | ||
shared.js | ||
tests.js | ||
translationRunner.js |