Fix merge issues

2019-06-30 10:55:00 +02:00
parent f0a512c7ca
commit 405d6a71c8
12 changed files with 60 additions and 2 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      4
+      2
    end

    def pre