Skip to content

Merge main into release/stable (resolved conflicts)#1331

Merged
jbujula merged 1 commit intorelease/stablefrom
cherry-pick-to-stable
Mar 24, 2026
Merged

Merge main into release/stable (resolved conflicts)#1331
jbujula merged 1 commit intorelease/stablefrom
cherry-pick-to-stable

Conversation

@MrRishabhJain
Copy link
Copy Markdown
Contributor

Summary

Conflict resolution

  • package.json: took main's webpack version (^5.105.4) and all security overrides
  • package-lock.json: took main's version (consistent with resolved package.json)
  • extension/overview.md: whitespace fix on version header

Closes #1328

🤖 Generated with Claude Code

Includes download-code-site and upload-code-site tasks (#1318),
claude skills, dependency updates (webpack ^5.105.4, security overrides),
and pac CLI 1.52.1.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@jbujula jbujula merged commit 64b3606 into release/stable Mar 24, 2026
3 checks passed
@jbujula jbujula deleted the cherry-pick-to-stable branch March 24, 2026 18:54
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