mirror of
https://github.com/funamitech/mastodon
synced 2024-12-15 23:28:31 +09: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. |
||
---|---|---|
.. | ||
_custom_emoji.html.haml | ||
index.html.haml | ||
new.html.haml |