Claire 32faa7213f Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README		2023-08-11 22:15:41 +02:00
..
rules	Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +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	Add end-to-end (system) tests (#25461)	2023-07-28 23:09:49 +02:00