catstodon/app/views/admin/settings
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
..
edit.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00