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

2020-02-27 12:37:15 +01:00
parent 9ee8e1add9 aa8568b7f2
commit 51d326f852
10 changed files with 230 additions and 125 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      1
+      2
    end

    def flags