1
0
puyopuyotetr.is/config/webpack
Claire c81d1b0d38 Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
2023-05-09 22:12:05 +02:00
..
rules Merge branch 'main' into glitch-soc/merge-upstream 2023-04-03 17:40:59 +02:00
configuration.js Refactor compile-time glitch-soc theme handling 2022-02-11 23:49:00 +01:00
development.js Bump webpack-merge from 4.2.2 to 5.0.9 () 2020-11-05 02:21:28 +09:00
generateLocalePacks.js Move locale-data back to app/javascript/mastodon/locales/locale-data () 2023-04-08 14:11:40 +02:00
production.js Add brotli compression () 2022-12-15 17:07:36 +01:00
shared.js Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream 2023-05-09 22:12:05 +02:00
tests.js Bump jest from 26.6.3 to 27.1.0 () 2021-08-28 09:58:04 +09:00
translationRunner.js Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream () 2023-05-07 18:22:25 +02:00