Claire b735954971 Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc.		2023-05-25 20:43:25 +02:00
..
rules	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-03 17:40:59 +02:00
configuration.js	…
development.js	…
generateLocalePacks.js	Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream	2023-05-25 20:43:25 +02:00
production.js	…
shared.js	Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
tests.js	…
translationRunner.js	Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream (#2208)	2023-05-07 18:22:25 +02:00