Claire c79a03b319 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our README.		2022-03-15 20:45:27 +01:00
..
_actions.html.haml	Add ability to mark statuses as sensitive from reports in admin UI (#17668)	2022-03-01 22:20:29 +01:00
_status.html.haml	Fix “edited at” in public pages not being properly localized (#17806)	2022-03-15 19:07:25 +01: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	2022-02-26 21:15:37 +01:00