mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-04-26 08:59:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into v5.0-release

Browse Source 
# Conflicts:
#	circle.yml
#	packages/server/test/unit/browsers/firefox_spec.ts
This commit is contained in:
Brian Mann
2020-07-17 18:51:52 -04:00
parent 09c72e3589 e695d59ac8
commit a491d5169a
31 changed files with 637 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/package.json
+1 -1
View File
@@ -86,7 +86,7 @@
"mocked-env": "1.2.4",
"nock": "12.0.2",
"postinstall-postinstall": "2.0.0",
"proxyquire": "2.1.0",
"proxyquire": "2.1.3",
"resolve-pkg": "2.0.0",
"shelljs": "0.8.3",
"sinon": "7.2.2",