mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2026-01-11 09:22:18 +01:00
Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some preferences to a new category, while glitch-soc had an extra preference there. Moved the extra preference like upstream did to the new category. |
||
|---|---|---|
| .. | ||
| contrast | ||
| entrypoints | ||
| fonts | ||
| mastodon | ||
| mastodon-light | ||
| application.scss | ||
| contrast.scss | ||
| mastodon-light.scss | ||
| win95.scss | ||