2 Commits (46b4268007f13ac2d6edfe914008e3850894f58b)

Author	SHA1	Message	Date
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
Renaud Chaput	29851c83bd	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	1 year ago