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

Conflicts: - app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
parent 2c2f649200 c88d9e524b
commit 33c80e0783
67 changed files with 896 additions and 288 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