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

Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
parent 857c67f31b bae268b2f6
commit a84aedb7a7
168 changed files with 3456 additions and 997 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
    end

    def flags
-      'rc2'
+      'rc3'
    end

    def suffix