Claire cd2ee0ec5f Merge commit '757d7c73c0' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept ours. - `yarn.lock`: Upstream changed from yarn 1 to yarn 4, but we had some different dependencies. Updated to yarn 4 and re-added our dependencies.		2023-12-18 18:25:33 +01:00
..
rules	Merge commit '3bf896c973' into glitch-soc/main	2023-12-17 17:43:30 +01:00
configuration.js	Merge commit 'd27216dc46' 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	Upgrade to Yarn 4, remove support for Node 16 (#27073)	2023-11-08 10:57:21 +00:00
shared.js	Merge commit 'dc09c10fa8' into glitch-soc/merge-upstream	2023-08-24 21:26:27 +02:00