Glitch-Shrike/app/javascript/mastodon
Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.
2020-11-20 13:27:48 +01:00
..
actions Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
components Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +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-20 13:27:48 +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 Fix image uploads being random data when canvas read access is blocked (#15180) 2020-11-18 18:01:58 +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
test_setup.js
uuid.js