Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-05-31 01:17:25 +00:00
parent e7b3a4263e c61c4565ab
commit 165b5dc7f5
28 changed files with 508 additions and 157 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
-      ''
+      'rc1'
    end

    def to_a