You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		3 years ago
..
_ip_block.html.haml	Add batch suspend for accounts in admin UI (#17009)	3 years ago
index.html.haml	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
new.html.haml	Add IP-based rules (#14963)	4 years ago