Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper/microtime-3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hakatashi authored Feb 19, 2019
2 parents 1fc753e + 6d640a3 commit b939ed2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"create-react-class": "^15.6.3",
"cross-env": "^5.2.0",
"cssnano": "^4.1.4",
"electron": "^3.0.2",
"electron": "^4.0.0",
"enzyme": "^3.6.0",
"enzyme-adapter-react-16": "^1.5.0",
"eslint": "^5.6.0",
Expand All @@ -82,7 +82,7 @@
"immutable": "^4.0.0-rc.9",
"istanbul": "next",
"jquery": "^3.3.1",
"karma": "^3.0.0",
"karma": "^4.0.0",
"karma-coverage": "^1.1.2",
"karma-electron": "^6.0.0",
"karma-mocha": "^1.3.0",
Expand All @@ -93,7 +93,7 @@
"livescript-loader": "^0.1.6",
"mathjs": "^5.1.2",
"microtime": "^3.0.0",
"mocha": "^5.2.0",
"mocha": "^6.0.0",
"mocha-logger": "^1.0.6",
"mocha-webpack": "^2.0.0-beta.0",
"mockery": "^2.1.0",
Expand Down

0 comments on commit b939ed2

Please sign in to comment.