Skip to content

Commit 2748e20

Browse files
committed
chore: merge main into release/1.3.0 to resolve divergence
Brings orphaned main commits from prior releases into the release branch so the v1.3.0 PR can fast-forward into main. Conflicts in package.json, package-lock.json, and CHANGELOG.md resolved in favour of the release branch (version 1.3.0, new changelog section). # Conflicts: # CHANGELOG.md # package.json
2 parents 1220b09 + 4af8b52 commit 2748e20

0 file changed

File tree

    0 commit comments

    Comments
     (0)