glitchier-soc/config/webpack
Claire db809f8789 Merge commit 'f3127af389f6043fe19c9ef4addefb6c6da0095a' into glitch-soc/merge-upstream
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
2023-07-30 13:42:06 +02:00
..
rules Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
configuration.js Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
development.js Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
production.js Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
shared.js Merge commit 'f3127af389f6043fe19c9ef4addefb6c6da0095a' into glitch-soc/merge-upstream 2023-07-30 13:42:06 +02:00
tests.js Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00