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

2019-01-20 16:49:23 +01:00
parent aa362ab73d 31e7940de5
commit 9dfbcf941e
37 changed files with 492 additions and 64 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -21,7 +21,7 @@ module Mastodon
    end

    def flags
-      'rc3'
+      ''
    end

    def to_a