Merge branch 'master' into services

This commit is contained in:
Alexey Kasyanchuk 2018-08-14 23:57:52 +03:00
commit 99ba94f401
2 changed files with 7 additions and 7 deletions

12
package-lock.json generated
View File

@ -1684,9 +1684,9 @@
"dev": true
},
"@types/node": {
"version": "8.10.23",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.23.tgz",
"integrity": "sha512-aEp5ZTLr4mYhR9S85cJ+sEYkcsgFY10N1Si5m49iTAVzanZXOwp/pgw6ibFLKXxpflqm71aSWZCRtnTXXO56gA==",
"version": "8.10.25",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.25.tgz",
"integrity": "sha512-WXvAXaknB0c2cJ7N44e1kUrVu5K90mSfPPaT5XxfuSMxEWva86EYIwxUZM3jNZ2P1CIC9e2z4WJqpAF69PQxeA==",
"dev": true
},
"@webassemblyjs/ast": {
@ -6670,9 +6670,9 @@
"dev": true
},
"electron": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/electron/-/electron-2.0.6.tgz",
"integrity": "sha512-1UHBWHF2EMjjVyTvcdcUBmISnoxElY4cUgkFVslw5pM1HxTVzi2vev+8NBohdLLFGbIbPyNua5vcBg+bxo1rqw==",
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/electron/-/electron-2.0.7.tgz",
"integrity": "sha512-MRrDE6mrp+ZrIBpZM27pxbO2yEDKYfkmc6Ll79BtedMNEZsY4+oblupeDJL6RM6meUIp82KMo63W7fP65Tb89Q==",
"dev": true,
"requires": {
"@types/node": "^8.0.24",

View File

@ -159,7 +159,7 @@
"babel-plugin-transform-object-rest-spread": "^7.0.0-beta.3",
"chai": "^4.1.2",
"css-loader": "^0.28.11",
"electron": "2.0.6",
"electron": "2.0.7",
"electron-builder": "20.14.7",
"eslint": "^4.19.1",
"eslint-plugin-react": "^7.9.1",