Merge branch 'release/1.1.2' into develop

rcreasey · rcreasey · commit ec9362a7171d · 2015-04-12T10:29:26.000-07:00
diff --git a/client/package.json b/client/package.json
@@ -2,7 +2,7 @@
   "name": "standing-fleet-client",
   "description": "Intelligence visualized",
   "repository": "git@github.com:rcreasey/standing-fleet.git",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "js/client.js",
   "dependencies": {
     "elementtree": "^0.1.6",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standing-fleet",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Intelligence visualized",
   "main": "server/index.js",
   "author": "GARPA",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "standing-fleet",`
`3`		`- "version": "1.1.1",`
	`3`	`+ "version": "1.1.2",`
`4`	`4`	`"description": "Intelligence visualized",`
`5`	`5`	`"main": "server/index.js",`
`6`	`6`	`"author": "GARPA",`