Claire 734e186717 Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' 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.		2023-06-10 15:32:29 +02:00
..
actions	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream	2023-06-10 15:32:29 +02:00
components	Fix overflow behavior of account rows (#25131)	2023-06-01 14:47:55 +02:00
containers	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	2023-06-02 15:00:27 +02:00
features	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream	2023-06-10 14:38:04 +02:00
locales	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream	2023-06-10 15:32:29 +02:00
polyfills	Upgrade react-intl (#24906)	2023-05-31 23:43:39 +02:00
reducers	Translate CW, poll options and media descriptions (#24175)	2023-06-01 00:10:21 +02:00
selectors	…
service_worker	Upgrade react-intl (#24906)	2023-05-31 23:43:39 +02:00
store	…
utils	Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 (#25172)	2023-05-31 09:27:21 +02:00
api.js	…
blurhash.ts	…
common.js	…
compare_id.ts	…
initial_state.js	…
is_mobile.ts	…
load_keyboard_extensions.js	…
main.jsx	…
performance.js	…
permissions.ts	…
ready.js	…
scroll.ts	…
settings.js	…
stream.js	…
test_setup.js	…
uuid.ts	…