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

2019-03-30 12:36:24 +01:00
parent b6fa500806 51625d3423
commit 4444d8f9b3
29 changed files with 454 additions and 182 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,11 +9,11 @@ module Mastodon
    end

    def minor
-      7
+      8
    end

    def patch
-      4
+      0
    end

    def pre
@@ -21,7 +21,7 @@ module Mastodon
    end

    def flags
-      ''
+      'rc1'
    end

    def to_a