mirror of
https://github.com/Siphonay/mastodon
synced 2025-02-12 12:24:46 +00:00
a84aedb7a7
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.