Claire 5fbe5fed1e 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
..
_announcement.html.haml	Fix design of announcements in admin UI (#12989)	2020-01-28 02:21:00 +01:00
edit.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
index.html.haml	Fix design of announcements in admin UI (#12989)	2020-01-28 02:21:00 +01:00
new.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00