tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
6bdec0aec967c5c64e46136f73666c4a67d5a641
Mastodon/app/views/admin/accounts/index.html.haml
Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.
2022-03-22 17:00:38 +01:00

3.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink