Merge branch 'develop'

iurimatias · iurimatias · commit 9b87dc79ecd2 · 2015-06-05T08:58:19.000-04:00
diff --git a/bin/embark b/bin/embark
@@ -7,7 +7,7 @@ var grunt = require('grunt');
 require('shelljs/global');
 
 program
-  .version('0.2.0')
+  .version('0.2.1')
 
 program.command('new [name]').description('New application').action(function(name) {
   if (name === undefined) {
diff --git a/boilerplate/package.json b/boilerplate/package.json
@@ -10,7 +10,7 @@
   "license": "ISC",
   "homepage": "",
   "devDependencies": {
-    "embark-framework": "^0.2.0",
+    "embark-framework": "^0.2.1",
     "commander": "^2.8.1",
     "compression": "^1.4.3",
     "express": "^4.12.3",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "embark-framework",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "embark-framework",`
`3`		`- "version": "0.2.0",`
	`3`	`+ "version": "0.2.1",`
`4`	`4`	`"description": "",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"test": "echo \"Error: no test specified\" && exit 1"`