Merge branch 'main' into next

Browse Source

# Conflicts:
#	netlify.toml
#	src/cli/find-cache-file.js
#	src/cli/utils.js
#	src/main/parser.js
#	website/playground/PrettierFormat.js
#	website/static/worker.js

...

This commit is contained in:

fisker Cheung committed 2022-08-01 11:27:34 +08:00

2 parents a145b5ec8d 765cae2552

commit 298347c9fb

31 files changed

+463 -37

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/integration/cli/cache/dir/.gitkeep

Vendored

Whitespace-only changes.