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 92d1e05c3e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end, glitch-soc had extra entries at the end. Added upstream's new line before glitch-soc's. - `Gemfile.lock`: Upstream updated dependencies while glitch-soc has an extra one (hcaptcha). Updated dependencies like upstream did. - `app/controllers/api/v1/statuses_controller.rb`: Not a real conflict, upstream added a parameter (`allowed_mentions`) where glitch-soc already had an extra one (`content_type`). Added upstream's new parameter. - `app/javascript/styles/fonts/roboto-mono.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes. - `app/javascript/styles/fonts/roboto.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes.		2 years ago
..
rules	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
configuration.js	Refactor compile-time glitch-soc theme handling	3 years ago
development.js	Bump webpack-merge from 4.2.2 to 5.0.9 (#14424)	4 years ago
generateLocalePacks.js	Change locales file generation to use JSON sources (#2028)	2 years ago
production.js	Add brotli compression (#19025)	2 years ago
shared.js	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
tests.js	Bump jest from 26.6.3 to 27.1.0 (#16376)	3 years ago
translationRunner.js	Change locales file generation to use JSON sources (#2028)	2 years ago