Merge upstream/develop into ai and add resolve MCP conflicts #1470
Merged
Commits
Commits on Sep 3, 2025
Commits on Sep 6, 2025
Commits on Sep 14, 2025
Commits on Sep 21, 2025
Commits on Oct 12, 2025
- andauthored
Commits on Nov 2, 2025
Commits on Nov 9, 2025
Commits on Nov 10, 2025
Commits on Nov 15, 2025
Commits on Nov 16, 2025
Commits on Nov 30, 2025
Commits on Dec 13, 2025
Commits on Dec 20, 2025
Commits on Dec 21, 2025
Commits on Dec 23, 2025
Commits on Dec 26, 2025
Commits on Dec 28, 2025
Commits on Jan 4, 2026
Commits on Jan 9, 2026
Commits on Jan 10, 2026
Commits on Jan 11, 2026
Commits on Jan 12, 2026
Commits on Jan 15, 2026
Commits on Jan 17, 2026
Commits on Jan 18, 2026
Commits on Feb 1, 2026
- andauthored

Commits on Feb 8, 2026
Commits on Mar 1, 2026
Commits on Mar 15, 2026
Commits on Apr 12, 2026
Commits on May 10, 2026
- authored
- andcommitted
- andcommitted