chore(sync): carry main back into beta

[rubenvdlinde]

main held 1 commit(s) beta did not — release version bumps committed onto the branch the release ran from, and anything else that arrived out of band. Left unreconciled, both branches change the version file independently and the next beta → main promotion conflicts on it.

0 file(s) change. A 0-file result is the normal and correct outcome once the content has already reached beta by other means — recording the ancestry is the payload. Without it the merge base never moves and the next promotion conflicts exactly as before.

Version files were resolved to beta's side, whose line is ahead of the released one, so this never moves a version backwards. Any conflict outside them aborts the merge for a human instead.

Opened by fleet-back-merge.yml, using the algorithm release.yml already applies to its own sync/*-to-development pull requests.

[github-actions]

Quality Report — ConductionNL/thematiq @ 0386fdf

Check	PHP	Vue	Security	License	Tests
lint	✅
phpcs	✅
phpmd	✅
psalm	✅
phpstan	✅
phpmetrics	✅
eslint		✅
stylelint		✅
build		✅
check-manifest		✅
test-l10n		✅
format		✅
composer			✅	✅ 104/104
npm			✅	✅ 2/2
app:check-code	⏭️
info.xml	✅
REUSE	❌
PHPUnit					✅
Newman					✅
Playwright					✅
Hydra gates					✅

---

Quality workflow — 2026-08-31 13:14 UTC

Download the full PDF report from the workflow artifacts.