fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-04 18:08:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/admin/statuses
History
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
..
index.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00