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

2017-12-15 01:17:12 +00:00
parent e5a9831a56 098c7d27fe
commit 37254c4f5d
11 changed files with 80 additions and 74 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
    end

    def pre
-      'rc5'
+      'rc6'
    end

    def flags