mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-01 12:29:03 +01: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. |
||
---|---|---|
.. | ||
show.html.haml |