Merge commit 'fbe9728f36998d3788e71c56bacc803c857fc422' into glitch-soc/merge-upstream

Conflicts:
- `docker-compose.yml`:
  Conflict because of different repo names. Updated version.
This commit is contained in:
Claire committed 2025-05-06 16:30:33 +02:00
commit 49e9a1fe4e
8 files changed
+56 -9

No files matched your search

+1 -1
View File
@@ -17,7 +17,7 @@ module Mastodon
end
def default_prerelease
'alpha.4'
'alpha.5'
end
def prerelease