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

2017-12-13 20:17:13 +00:00
parent 82236a3703 7cad926401
commit 10f800ab46
2 changed files with 6 additions and 5 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
    end

    def pre
-      'rc4'
+      'rc5'
    end

    def flags