Skip to content

Merge dev into next-dev - #41

Merged
ps2 merged 9 commits into
next-devfrom
merge-dev-into-next-dev
Oct 22, 2026
Merged

ps2 merged 9 commits into
next-devfrom
merge-dev-into-next-dev

Conversation

@ps2

@ps2 ps2 commented Oct 22, 2026 •

Copy link
Copy Markdown
Contributor

Merges main into next-dev so that LoopKit/LoopWorkspace#454 (next-dev → dev) no longer conflicts and drops nothing from dev.

Only Lokalise translation updates come from main; it merged without conflicts.

Built as part of the whole workspace (LoopWorkspace scheme, iOS Simulator) with every submodule at its merge commit.

Please merge with "Create a merge commit" (not squash or rebase); otherwise the merge history is lost and dev will conflict with next-dev again.

@ps2
ps2 merged commit 81112d8 into next-dev Oct 22, 2026
@ps2
ps2 deleted the merge-dev-into-next-dev branch October 22, 2026 23:07
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.

2 participants