Claire 0845bee8d6 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.		2022-02-09 17:28:33 +01:00
..
_account.html.haml	Add batch suspend for accounts in admin UI (#17009)	2021-12-05 21:48:39 +01:00
index.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
show.html.haml	Change languages to be listed under standard instead of native name in admin UI (#17485)	2022-02-09 04:15:38 +01:00