chuckya/app/javascript/mastodon/features/compose
Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream
- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.
2021-05-07 18:21:59 +02:00
..
components Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
containers Add dropdown for boost privacy in boost confirmation modal (#15704) 2021-02-11 00:53:12 +01:00
util Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382) 2021-03-02 12:02:56 +01:00
index.js Add confirmation modal when logging out from the web app (#11671) 2019-08-26 18:24:10 +02:00