mirror of
https://github.com/funamitech/mastodon
synced 2024-12-16 23:59:11 +09:00
c04f2d0cf7
Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes. |
||
---|---|---|
.. | ||
about | ||
appearance | ||
branding | ||
content_retention | ||
discovery | ||
other | ||
registrations | ||
shared |