Commit Graph

106 Commits

Author SHA1 Message Date
Greg 9df1b119c6
Merge branch 'trunk' into add/run-api-tests-on-pr 2021-11-03 08:47:30 -06:00
Greg 574b5282a2 Fix imports 2021-11-01 14:40:03 -06:00
Greg fabf6bf8c6 Code review feedback 2021-11-01 14:26:16 -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
Greg 5ba261950c Use category ID instead of category name 2021-10-29 15:19:14 -06:00
Paul Sealock 789d942f89
Update e2e package locations and add PNPM (#30977) 2021-10-29 08:32:31 +13:00