Glitch-Shrike/app/javascript/mastodon
Thibaut Girka e71b16ae2b Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  glitch-soc-only dependency textually too close to updated upstream
  dependencies. Updated to upsteam dependencies.
2020-11-25 15:31:45 +01:00
..
actions Merge branch 'master' into glitch-soc/merge-upstream 2020-11-25 15:31:45 +01:00
components Remove fade-in animation from modals in web UI (#15199) 2020-11-21 23:54:36 +01:00
containers Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +01:00
features Merge branch 'master' into glitch-soc/merge-upstream 2020-11-25 15:31:45 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2020-11-12 22:13:57 +01:00
middleware
reducers Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +01:00
selectors
service_worker
storage
store
utils Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
api.js
base_polyfills.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
is_mobile.js Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +01:00
load_keyboard_extensions.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
test_setup.js
uuid.js