Merge branch 'develop' of github.com:iurimatias/embark-framework into develop

iurimatias · iurimatias · commit 06f4d99ce886 · 2017-06-27T21:07:31.000-04:00
diff --git a/demo/package.json b/demo/package.json
@@ -10,7 +10,7 @@
   "license": "ISC",
   "homepage": "",
   "devDependencies": {
-    "embark": "^2.5.0",
+    "embark": "/Users/iurimatias/Projects/embark-framework",
     "mocha": "^2.2.5"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"license": "ISC",`
`11`	`11`	`"homepage": "",`
`12`	`12`	`"devDependencies": {`
`13`		`- "embark": "^2.5.0",`
	`13`	`+ "embark": "/Users/iurimatias/Projects/embark-framework",`
`14`	`14`	`"mocha": "^2.2.5"`
`15`	`15`	`}`
`16`	`16`	`}`