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

2018-01-05 22:17:12 +00:00
parent f41b33eb01 10f6793fd0
commit f6adb409fd
14 changed files with 69 additions and 10 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