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 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		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	Javascript intl8n flavour support	7 years ago
production.js	Replace to `workbox-webpack-plugin` from `offline-plugin` (#18409)	2 years ago
shared.js	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
tests.js	Bump jest from 26.6.3 to 27.1.0 (#16376)	3 years ago
translationRunner.js	Upgrade yargs to v12.0 (#9862)	6 years ago