1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-24 16:43:08 -05:00
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
..
2019-09-29 21:31:51 +02:00
2020-10-12 16:33:49 +02:00
2020-06-02 19:24:53 +02:00
2022-01-16 22:26:18 +01:00