Claire ddf3ad9541 Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main ...

Conflicts:
- `package.json`:
  Upstream removed a dependency textually close to a glitch-only dependency.
  Updated as upstream while keeping our dependency.

2023-12-17 17:43:30 +01:00

..

rules

Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main

2023-12-17 17:43:30 +01:00

configuration.js

Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' 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

Use NodeJS v20 by default (#26830)

2023-09-08 13:45:34 +02:00

shared.js

Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream

2023-08-24 21:26:27 +02:00