mastodon-glitch/app/views/admin/ip_blocks
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
..
_ip_block.html.haml Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00
index.html.haml Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
new.html.haml Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00