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

2018-11-27 15:10:58 +01:00
parent f969eca07e 637d0ed838
commit 55edfd6e0e
6 changed files with 68 additions and 11 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      1
+      2
    end

    def pre