mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-05 04:29:03 +01:00
63acdebc5d
Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because of a code style fix, while some changed lines are absent from glitch-soc. Ignored the deleted lines. |
||
---|---|---|
.. | ||
two_factor | ||
new.html.haml | ||
two_factor.html.haml |