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 5c4a012ac5 Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did. - `app/javascript/packs/public.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did.		2 years ago
..
rules	Merge branch 'main' into glitch-soc/merge-upstream	2 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	Move locale-data back to `app/javascript/mastodon/locales/locale-data` (#2169)	2 years ago
production.js	Add brotli compression (#19025)	2 years ago
shared.js	Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' 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	Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream (#2208)	2 years ago