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

2020-02-19 23:04:18 +01:00
parent 955f838f9d ff3a11d01d
commit e037002401
16 changed files with 276 additions and 214 deletions
@@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      0
+      1
    end

    def flags