Merge branch 'main' into glitch-soc/merge-upstream

Conflicts: - `.github/workflows/build-image.yml`: Upstream attempted something with tags. Kept our version.
2023-07-07 19:59:43 +02:00
parent 513078de7a 0051128387
commit b9aa228c54
8 changed files with 33 additions and 7 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      3
+      4
    end

    def flags