mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-11 18:22:53 -05:00
f61aa8e0f7
Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb