mirror of
https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git
synced 2026-01-20 09:49:03 -08:00
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 | ||