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

2020-02-03 09:22:58 +01:00
parent 4cd2d13bd2 3adc722d1c
commit 369201a425
23 changed files with 179 additions and 52 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
    end

    def flags
-      'rc1'
+      'rc2'
    end

    def suffix