tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
f3af434c25dc28254b6422787cee606ab6f73fb2
Mastodon/app/views/admin/statuses/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

1.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink