mirror of
https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git
synced 2026-01-12 05:53:14 -08:00
Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| build-image.yml | ||
| check-i18n.yml | ||
| linter.yml | ||
| test-chart.yml | ||