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

2020-07-16 14:43:50 +02:00
parent 37c092e9fd ea13e80030
commit 1c6c40d17c
24 changed files with 386 additions and 128 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,15 +9,15 @@ module Mastodon
    end

    def minor
-      1
+      2
    end

    def patch
-      5
+      0
    end

    def flags
-      ''
+      'rc1'
    end

    def suffix