Glitch-Shrike/app/javascript/mastodon
Claire 0e74d4da59 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Changed upstream, while we modified it in glitch-soc to not get spammed
  by dependabot.
  Kept it removed.
- `README.md`:
  Changed upstream, which has a very different version.
  Discarded upstream changes.
2022-06-21 08:28:59 +02:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 22:29:05 +02:00
components Remove unnused otherAccounts property (#18556) 2022-05-30 17:10:13 +02:00
containers
features Merge branch 'main' into glitch-soc/merge-upstream 2022-06-10 11:51:43 +02:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2022-06-21 08:28:59 +02:00
middleware
reducers Change language to be carried over on reply (#18557) 2022-05-31 05:53:43 +02:00
selectors Add `limited` attribute to accounts in REST API and a warning in web UI (#18344) 2022-05-10 09:44:35 +02:00
service_worker
storage
store
utils Add support for webp uploads (#18506) 2022-05-27 20:06:40 +02:00
api.js
base_polyfills.js
blurhash.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 22:29:05 +02:00
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