Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system.		2021-12-16 16:20:44 +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	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00