Claire ab59743c13 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Upstream removed a line close to one modified by glitch-soc.
  Removed the line as upstream did.

2023-01-14 22:34:09 +01:00

..

_actions.html.haml

Fix crash when marking statuses as sensitive while some statuses are deleted (#22134)

2023-01-13 10:46:52 +01:00

_media_attachments.html.haml

Add ability to view previous edits of a status in admin UI (#19462)

2022-10-26 13:42:29 +02:00

_status.html.haml

Add ability to view previous edits of a status in admin UI (#19462)

2022-10-26 13:42:29 +02:00

index.html.haml

Change how changes to media attachments are stored for edits (#17696)

2022-03-09 09:06:17 +01:00

show.html.haml

Merge branch 'main' into glitch-soc/merge-upstream

2023-01-14 22:34:09 +01:00