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

2019-02-19 20:18:40 +01:00
parent 896beb16c5 8e7fc7ec73
commit ff0576cc2b
15 changed files with 120 additions and 41 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