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

2020-05-14 18:49:10 +02:00
parent e1d2820234 c9dcc2d39f
commit f94aebafe5
162 changed files with 3312 additions and 869 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      3
+      4
    end

    def flags