mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 05:39:02 +09:00
ab59743c13
Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did. |
||
---|---|---|
.. | ||
_account.html.haml | ||
show.html.haml |