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

2018-10-31 10:08:36 +01:00
parent 2b2facbbdf ba06a5f485
commit 75b48dc177
10 changed files with 41 additions and 62 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      0
+      1
    end

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

    def flags
-      'rc4'
+      ''
    end

    def to_a