Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-09 05:17:13 +00:00
parent 488381ae2f 628358aeea
commit 7c719c567c
7 changed files with 24 additions and 14 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      2
+      3
    end

    def pre