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

charlesh88 · charlesh88 · commit 624f09777f8a · 2016-07-26T15:02:55.000-07:00
diff --git a/package.json b/package.json
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "openmct",`
`3`		`- "version": "0.11.0-SNAPSHOT",`
	`3`	`+ "version": "0.11.1-SNAPSHOT",`
`4`	`4`	`"description": "The Open MCT core platform",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"express": "^4.13.1",`