mirror of
https://github.com/Dokploy/dokploy.git
synced 2026-09-12 19:51:00 +05:00
Resolve conflicts in docker.ts and domain.ts: canary already contains a superset of main's hotfix cherry-picks (isDockerDesktop, isolated network label pinning), just refactored/reformatted, so both sides kept canary's version. Also fix hotfix-cherry-pick.yml to sync each cherry-pick back into canary immediately, so canary and main share history for that change and the next canary->main release PR doesn't re-conflict on it. |
||
|---|---|---|
| .. | ||
| ISSUE_TEMPLATE | ||
| sponsors | ||
| workflows | ||
| CODEOWNERS | ||
| FUNDING.yml | ||
| pull_request_template.md | ||