Skip to content

Sync main → staging (back-merge docs/CNAME)#80

Merged
kbens merged 4 commits into
stagingfrom
main
May 12, 2026
Merged

Sync main → staging (back-merge docs/CNAME)#80
kbens merged 4 commits into
stagingfrom
main

Conversation

@kbens
Copy link
Copy Markdown
Member

@kbens kbens commented May 12, 2026

Back-merge to keep staging in sync after the direct-to-main hotfix in #79.

What's coming back

  • da8cd58 Add docs/CNAME for cli.psadmin.io custom domain

The merge commits (#78, #79) are not backported — those live on main by design.

Why

Without this, the next staging → main release PR would show a phantom delete of docs/CNAME (or a conflict). Standard back-merge pattern after a hotfix lands directly on main.

@kbens kbens merged commit e27956f into staging May 12, 2026
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant