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

2018-09-01 17:23:46 +02:00
parent cc7adf7e84 0e661dd2e9
commit a74a7d5fe3
6 changed files with 12 additions and 11 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -21,7 +21,7 @@ module Mastodon
    end

    def flags
-      'rc1'
+      'rc2'
    end

    def to_a