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

2017-12-08 13:17:14 +00:00
parent 717b7d555c dad0a09675
commit 776867ea73
77 changed files with 1799 additions and 545 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
    end

    def pre
-      'rc1'
+      'rc2'
    end

    def flags