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
..
2017-11-24 02:05:53 +01:00
2020-01-23 22:00:13 +01:00
2020-01-23 22:00:13 +01:00
2020-06-02 19:24:53 +02:00
2020-10-12 16:33:49 +02:00
2020-06-02 19:24:53 +02:00
2020-06-02 19:24:53 +02:00
2021-02-21 19:50:12 +01:00
2020-06-02 19:24:53 +02:00
2017-01-13 03:24:41 +01:00