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

2018-12-02 20:29:14 +01:00
parent 44e6c2dd74 2df5ef18ae
commit d32d33f408
6 changed files with 69 additions and 1 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      4
+      5
    end

    def pre