Skip to content

chore(sync): merge master into develop (manual conflict resolution) - #651

Merged
Starosdev merged 2 commits into
developfrom
master
Jul 15, 2026
Merged

chore(sync): merge master into develop (manual conflict resolution)#651
Starosdev merged 2 commits into
developfrom
master

Conversation

@github-actions

@github-actions github-actions Bot commented Jul 7, 2026

Copy link
Copy Markdown

Automated branch sync could not fast-forward develop because master and develop have conflicting changes.

Resolve the conflicts and merge this PR to keep develop in sync with master.

Note: opened by GITHUB_TOKEN, so CI does not run automatically. Verify locally before merging.

@github-actions
github-actions Bot requested a review from Starosdev as a code owner July 7, 2026 03:44
@semantic-release-bot
chore(release): 1.66.0
f208961 
## [1.66.0](v1.65.0...v1.66.0) (2026-07-08)

### Features

* **release:** promote beta to master ([#650](#650)) ([c963973](c963973))

### Bug Fixes

* **ui:** dark mode tokens for settings dialog and dropdowns ([#634](#634)) ([c38d06f](c38d06f))
@Starosdev Starosdev mentioned this pull request Jul 15, 2026
Merged
@Starosdev
Starosdev merged commit 89bb1a4 into develop Jul 15, 2026
34 of 39 checks passed
@Starosdev

Starosdev commented Jul 15, 2026

Copy link
Copy Markdown
Owner

Superseded by #659, which reconciled the current develop and beta histories, retained the master release changes, and passed the full CI suite.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Starosdev Starosdev Awaiting requested review from Starosdev Starosdev is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Starosdev @semantic-release-bot