Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.		2023-01-18 17:38:11 +01:00
..
actions	Add confirmation screen when handling reports (#22375)	2023-01-18 16:40:09 +01:00
_actions.html.haml	Add confirmation screen when handling reports (#22375)	2023-01-18 16:40:09 +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