mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2026-01-01 12:31:57 +01:00
Conflicts: - `app/helpers/theme_helper.rb`: Conflict because of different theming system. Adapted upstream's changes. - `vite.config.mts`: Conflict because of different theming system. Adapted upstream's changes. |
||
|---|---|---|
| .. | ||
| glitch | ||
| vanilla | ||