Merge branch 'develop' into master

dbusel · web-flow · commit 95d0eb364b1b · 2019-03-01T15:23:22.000+03:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "iofogcontroller",
-	"version": "1.0.37-prerelease.2",
+	"version": "1.0.37",
 	"description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.",
 	"main": "./src/main.js",
 	"author": "Saeid Baghbidi",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "iofogcontroller",`
`3`		`- "version": "1.0.37-prerelease.2",`
	`3`	`+ "version": "1.0.37",`
`4`	`4`	`"description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.",`
`5`	`5`	`"main": "./src/main.js",`
`6`	`6`	`"author": "Saeid Baghbidi",`