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

2018-07-11 17:57:08 +02:00
parent 612b00d1bb 7ac5151b74
commit 6f0f583abe
93 changed files with 908 additions and 91 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