mastodon/.github
Claire 3d25fe0426 Merge branch 'main' into glitch-soc/merge-upstream
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.
2022-02-23 18:13:12 +01:00
..
ISSUE_TEMPLATE
workflows Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01:00
CODEOWNERS
FUNDING.yml
stale.yml