Skip to content

Commit f99a53e

Browse files
committed
Merge origin/main into fix/settings-run-option-rules
#1097 was squash-merged, so its commits are not the ones on main and the shared SettingsPage.tsx conflicted. Resolved in favour of this branch's shared run-option table, keeping the Devices section main brought in.
2 parents 73c73ab + aa349a4 commit f99a53e

72 files changed

Lines changed: 523 additions & 424 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/actions-run-branch.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/actions-unique-correlation-id.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/brave-moons-shave.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/connection-profiles-device.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/context-fragment-conversations.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

.changeset/context-fragment-knowledge-base.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

.changeset/conversation-view.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

.changeset/daemon-non-loopback-bind-token.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

.changeset/device-status-remove.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

.changeset/fix-997-no-silent-worktree-downgrade.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)