Marc-André Bombeck 98f7d11861 chore: resolve parallel-agent merge conflicts + sweep up loose edits ...

7 conflict files resolved by taking the upstream/HEAD side (which carries
the W4d/W5/W6c/W3f feature additions). Stashed-side changes that were
genuine new features re-land in subsequent commits if any were lost.

This sweeps up the loose state the W4e+W5e+W5d combined agent left
mid-stash. Resolves develop's working tree for clean push.

2026-05-14 14:19:08 +02:00

..

2026-04-26-PLAN.md

chore(style): repo-wide prettier sweep before v1.4.6 tag

2026-05-09 02:27:17 +02:00

v146-findings.md

style: prettier on touched insights/coach surfaces

2026-05-10 18:23:20 +02:00

v146-summary.md

docs: scrub PII + internal jargon + German leaks from user-facing artifacts

2026-05-10 15:14:28 +02:00

v1414-performance.md

docs: scrub PII + internal jargon + German leaks from user-facing artifacts

2026-05-10 15:14:28 +02:00

v1414-summary.md

docs: scrub PII + internal jargon + German leaks from user-facing artifacts

2026-05-10 15:14:28 +02:00

v1414-ux-friction.md

docs: scrub PII + internal jargon + German leaks from user-facing artifacts

2026-05-10 15:14:28 +02:00

v1415-auto-deploy.md

chore(security): MED cluster — Coolify URL scrub + isCurrent device-id + SLEEP_DURATION migration note

2026-05-11 02:44:12 +02:00

v1415-ci-reliability.md

docs: scrub PII + internal jargon + German leaks from user-facing artifacts

2026-05-10 15:14:28 +02:00

v1415-empty-states.md

style: prettier on touched insights/coach surfaces

2026-05-10 18:23:20 +02:00

v1415-i18n-coverage.md

docs: scrub PII + internal jargon + German leaks from user-facing artifacts

2026-05-10 15:14:28 +02:00

v1415-summary.md

docs: scrub PII + internal jargon + German leaks from user-facing artifacts

2026-05-10 15:14:28 +02:00

v1416-ai-roadmap.md

docs: scrub PII + internal jargon + German leaks from user-facing artifacts

2026-05-10 15:14:28 +02:00

v1416-auto-deploy-fix.md

docs: scrub PII + internal jargon + German leaks from user-facing artifacts

2026-05-10 15:14:28 +02:00

v1416-settings-audit.md

style: prettier on touched insights/coach surfaces

2026-05-10 18:23:20 +02:00

v1416-summary.md

style: prettier on touched insights/coach surfaces

2026-05-10 18:23:20 +02:00

v1418-summary.md

style: prettier on touched insights/coach surfaces

2026-05-10 18:23:20 +02:00

v1419-summary.md

style: prettier on touched insights/coach surfaces

2026-05-10 18:23:20 +02:00

v1420-summary.md

chore(format): prettier sweep across develop

2026-05-11 08:27:51 +02:00

v1421-summary.md

chore(format): prettier sweep across develop

2026-05-11 08:27:51 +02:00

v1422-summary.md

chore(release): v1.4.24

2026-05-12 22:33:35 +02:00

v1423-summary.md

chore: resolve parallel-agent merge conflicts + sweep up loose edits

2026-05-14 14:19:08 +02:00