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

2018-03-13 18:17:20 +00:00
parent f8e934f955 fd385e256d
commit d75a6054a0
55 changed files with 441 additions and 226 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -21,7 +21,7 @@ module Mastodon
    end

    def flags
-      'rc2'
+      ''
    end

    def to_a