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

Conflicts: - README.md: kept our version
2019-01-28 21:14:47 +01:00
parent e488faaa4a 28866d329b
commit 42713b9710
5 changed files with 20 additions and 4 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      0
+      1
    end

    def pre