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 3b87fe21fa Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/load_locale.js`: The file moved to `app/javascript/mastodon/locales/load_locale.ts`. Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`. - `app/javascript/mastodon/locales/index.js`: The file moved to `app/javascript/mastodon/locales/index.ts`. Did *not* port the changes as I want to try something a bit different.		1 year ago
..
admin.jsx	Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream	1 year ago
application.js	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	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)	1 year ago
public.jsx	Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream	1 year ago
share.jsx	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	1 year ago
sign_up.js	Enforce import order with ESLint (#25096)	1 year ago