Skip to content

Commit

Permalink
Merge branch 'dev' into add_new_spectron_test
Browse files Browse the repository at this point in the history
  • Loading branch information
rbuels committed May 2, 2018
2 parents f1a791a + 017eff4 commit a3101b0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -76,7 +76,7 @@
"spectron-fake-dialog": "^0.0.1",
"style-loader": "^0.20.2",
"tmp": "^0.0.33",
"tribble-index": "^1.0.1",
"tribble-index": "1.0.2",
"uglifyjs-webpack-plugin": "^1.2.2",
"url-loader": "0.5.7",
"util-deprecate": "^1.0.2",
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Expand Up @@ -7102,9 +7102,9 @@ tough-cookie@~2.3.0, tough-cookie@~2.3.3:
version "0.3.9"
resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"

tribble-index@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/tribble-index/-/tribble-index-1.0.1.tgz#c3eba29d671ebac5bd66ee26ad934df70fcf6ae8"
tribble-index@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/tribble-index/-/tribble-index-1.0.2.tgz#ee9765d2fa8911ff87fe0677a630f065852fdfa0"
dependencies:
binary-parser "^1.3.2"
es6-promisify "^6.0.0"
Expand Down

0 comments on commit a3101b0

Please sign in to comment.