nyastodon/app/javascript/mastodon/features/compose
Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
  For some reason we changed the file loading path in glitch-soc,
  but now upstream has completely changed how the logo is loaded.
  Applied upstream changes.
2021-02-12 10:28:32 +01:00
..
components Merge branch 'main' into glitch-soc/merge-upstream 2021-02-12 10:28:32 +01:00
containers Add dropdown for boost privacy in boost confirmation modal (#15704) 2021-02-11 00:53:12 +01:00
util Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
index.js Add confirmation modal when logging out from the web app (#11671) 2019-08-26 18:24:10 +02:00