Glitch-Shrike/app/javascript/mastodon
Claire d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
2023-06-10 16:22:14 +02:00
..
actions Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +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 '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
locales Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
polyfills Upgrade react-intl (#24906) 2023-05-31 23:43:39 +02:00
reducers Add exclusive lists (#22048) 2023-06-05 09:37:02 +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