Merge branch 'master' of github.com:nasa/openmct into open967

This commit is contained in:
David Hudson 2016-09-09 12:02:50 +09:00
commit da23bba392

View File

@ -40,7 +40,7 @@
"mkdirp": "^0.5.1",
"moment": "^2.11.1",
"node-bourbon": "^4.2.3",
"phantomjs-prebuilt": "^2.1.0",
"phantomjs-prebuilt": "2.1.11 || >2.1.12 <3.0.0",
"requirejs": "2.1.x",
"split": "^1.0.0"
},