Merge branch 'master' of github.com:kitematic/kitematic

This commit is contained in:
Jeffrey Morgan
2015-06-18 12:24:05 -07:00
5 changed files with 15 additions and 16 deletions

View File

@@ -41,8 +41,8 @@
"classnames": "^1.2.0",
"coveralls": "^2.11.2",
"deep-extend": "^0.4.0",
"exec": "0.2.0",
"dockerode": "^2.1.4",
"exec": "0.2.0",
"install": "^0.1.8",
"jquery": "^2.1.3",
"mixpanel": "0.2.0",
@@ -50,6 +50,7 @@
"node-uuid": "^1.4.3",
"npm": "^2.9.1",
"object-assign": "^2.0.0",
"osx-release": "^1.1.0",
"parseUri": "^1.2.3-2",
"react": "^0.13.1",
"react-bootstrap": "^0.20.3",