tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
8158b04d18
mastodon/app/views/admin/accounts
History
Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58: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 Add appeals (#17364) 2022-02-14 21:27:53 +01:00