Commit Graph

3 Commits

Author SHA1 Message Date
Greg e45c270a51 Add file missing from merge 2021-10-29 15:33:37 -06:00
Greg a28840b1d9 Merge branch 'trunk' of github.com:woocommerce/woocommerce into add/run-api-tests-on-pr
# Conflicts:
#	.github/workflows/pr-build-and-e2e-tests.yml
#	plugins/woocommerce/tests/e2e/core-tests/specs/merchant/wp-admin-product-import-csv.test.js
2021-10-29 15:31:48 -06:00
Paul Sealock 789d942f89
Update e2e package locations and add PNPM (#30977) 2021-10-29 08:32:31 +13:00