masto-fe/app/javascript/mastodon/features/compose
Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
2020-12-15 14:27:06 +01:00
..
components Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
containers Make “Mark media as sensitive” properly translatable (#15051) 2020-10-27 03:05:50 +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