Glitch-Shrike/app/javascript/mastodon
Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.
2022-03-22 17:00:38 +01:00
..
actions
components
containers
features Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00
middleware
reducers
selectors
service_worker
storage
store
utils
api.js
base_polyfills.js
blurhash.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js
main.js
performance.js
ready.js
scroll.js
settings.js
stream.js
test_setup.js
uuid.js