mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-19 00:21:40 +01:00
3d25fe0426
Conflicts: - `.github/workflows/build-image.yml`: Upstream changed the workflow a bit. Conflict comes from us pushing to ghcr while upstream pushes to dockerhub. Ported the upstream changes while still pushing to ghcr.