Merge branch 'master' into glitch-soc/merge-upstream

2018-05-23 16:05:19 +02:00
parent 2289250f69 d8864b9e9d
commit e0ef89c73f
21 changed files with 295 additions and 70 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -21,7 +21,7 @@ module Mastodon
    end

    def flags
-      'rc5'
+      ''
    end

    def to_a