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

2023-08-24 21:03:56 +02:00
parent fbfc4145fd facfec1ba3
commit 88ff45a3b2
21 changed files with 617 additions and 115 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
    end

    def flags
-      ENV.fetch('MASTODON_VERSION_FLAGS', '-beta1')
+      ENV.fetch('MASTODON_VERSION_FLAGS', '-beta2')
    end

    def suffix