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

2021-06-03 20:47:02 +02:00
parent 02dffa8edd f6088922c0
commit 0157caacef
498 changed files with 1454 additions and 551 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      0
+      1
    end

    def flags