You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.		4 years ago
..
rules	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
configuration.js	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
development.js	Bump webpack-merge from 4.2.2 to 5.0.9 (#14424)	4 years ago
generateLocalePacks.js	…
production.js	Bump webpack-merge from 4.2.2 to 5.0.9 (#14424)	4 years ago
shared.js	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
tests.js	Bump webpack-merge from 4.2.2 to 5.0.9 (#14424)	4 years ago
translationRunner.js	Upgrade yargs to v12.0 (#9862)	6 years ago