Merge branch 'develop' into feature/cloud-responder

rjmackay · rjmackay · commit d341bbb45ce7 · 2016-02-19T01:45:21.000+13:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ushahidi-platform-client",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Ushahidi Platform Official Web Client",
   "main": "gulpfile.js",
   "repository": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ushahidi-platform-client",`
`3`		`- "version": "3.1.0",`
	`3`	`+ "version": "3.2.0",`
`4`	`4`	`"description": "Ushahidi Platform Official Web Client",`
`5`	`5`	`"main": "gulpfile.js",`
`6`	`6`	`"repository": {`