Skip to content

Conversation

@stephendeoca
Copy link
Contributor

After this merge, a git diff between the dev and main branch should result in no changes.

johnDance and others added 16 commits December 21, 2022 08:52
Merge dev to main for v1.10.0
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](json5/json5@v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
bump webpack
awful workflow while I figure out my two github accounts
from this breaking change in @types/node, a transitive dependency of the repo.
to avoid the deprecations in ts 5 that make another reason we should move off tslint
npm audit: fix critical vulnerabilities
@salesforce-cla
Copy link

salesforce-cla bot commented Mar 4, 2024

Thanks for the contribution! Before we can merge this, we need @johnDance to sign the Salesforce Inc. Contributor License Agreement.

@stephendeoca stephendeoca changed the title Merge main into dev Update dev branch to match main branch Mar 4, 2024
@stephendeoca stephendeoca merged commit 94af0e8 into dev Mar 5, 2024
@stephendeoca stephendeoca deleted the update-dev branch March 5, 2024 00:04
@bcantoni
Copy link
Contributor

bcantoni commented Mar 5, 2024

Regarding the CLA bot complaining about John Dance, we can merge without that. Those are old commits authored by John when he was still a Tableau employee.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants