catstodon/app/views/admin/accounts
Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
..
_account.html.haml Change how unconfirmed accounts are displayed in admin UI (#17874) 2022-03-26 02:53:13 +01:00
index.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
show.html.haml Allow admins to refresh remotely-suspended accounts (#22327) 2022-12-15 14:15:50 +01:00