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

53 KiB

Raw Blame History

View Raw