mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-12 18:52:52 -05:00
b135b6ba8f
Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name.