Merge remote-tracking branch 'origin/master' into frontend-1047

This commit is contained in:
Charles Hacskaylo 2016-07-26 15:02:55 -07:00
commit 624f09777f

View File

@ -1,6 +1,6 @@
{
"name": "openmct",
"version": "0.11.0-SNAPSHOT",
"version": "0.11.1-SNAPSHOT",
"description": "The Open MCT core platform",
"dependencies": {
"express": "^4.13.1",