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 c22b032483 Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, but we've deleted it. Keep it deleted. - `app/javascript/mastodon/locales/index.js`: Reworked upstream, but the code was mostly in `app/javascript/locales/index.js` in glitch-soc. Updated that file accordingly. - `app/javascript/packs/public.jsx`: Not a real conflict, but different imports in glitch-soc and upstream. - `app/views/layouts/application.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `app/views/layouts/embedded.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `config/webpack/generateLocalePacks.js`: Deleted upstream, as upstream now directly loads the JSON at runtime. Deleted as well, will switch to runtime loading in an upcoming commit. - `config/webpack/shared.js`: Not a real conflict, but different imports in glitch-soc and upstream. - `config/webpack/translationRunner.js`: Mostly deleted upstream, to be replaced with `formatjs-formatter.js` instead. Moved the glitch-soc logic there and deleted the file.		1 year ago
..
admin.jsx	Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream	1 year ago
application.js	Upgrade react-intl (#24906)	1 year ago
common.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	4 years ago
error.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	4 years ago
public-path.js	Move ESLint configs to overrides (#24370)	2 years ago
public.jsx	Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream	1 year ago
share.jsx	Upgrade react-intl (#24906)	1 year ago
sign_up.js	Enforce import order with ESLint (#25096)	2 years ago