mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 18:28:50 +09:00
322e907e04
Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change. |
||
---|---|---|
.. | ||
_account.html.haml | ||
index.html.haml | ||
show.html.haml |