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.

Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock		6 years ago
..
rules	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	6 years ago
configuration.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
development.js	…
generateLocalePacks.js	…
production.js	perf: remove stats.json generation in webpack (#10290)	6 years ago
shared.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
test.js	…
translationRunner.js	…