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

2019-06-13 22:23:20 +02:00
parent 80849812d2 c9eeb2e832
commit 60adda7e59
255 changed files with 2788 additions and 3451 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -21,7 +21,7 @@ module Mastodon
    end

    def flags
-      'rc1'
+      ''
    end

    def to_a