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

2021-05-09 10:41:28 +02:00
parent 5233e99106 9b18914c35
commit 87c3a0d0b3
187 changed files with 5853 additions and 2364 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -9,7 +9,7 @@ module Mastodon
    end

    def minor
-      3
+      4
    end

    def patch
@ -17,7 +17,7 @@ module Mastodon
    end

    def flags
-      ''
+      'rc1'
    end

    def suffix