Merge branch 'develop'

iurimatias · iurimatias · commit c0a716d2bb89 · 2015-07-15T08:16:48.000-04:00
diff --git a/bin/embark b/bin/embark
@@ -14,7 +14,7 @@ var run = function(cmd) {
   }
 }
 
-var deploy = fnction(embarkConfig) {
+var deploy = function(embarkConfig) {
   contractFiles = grunt.file.expand(embarkConfig.contracts);
   destFile = embarkConfig.output
   Embark.init()

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ var run = function(cmd) {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`-var deploy = fnction(embarkConfig) {`
	`17`	`+var deploy = function(embarkConfig) {`
`18`	`18`	`contractFiles = grunt.file.expand(embarkConfig.contracts);`
`19`	`19`	`destFile = embarkConfig.output`
`20`	`20`	`Embark.init()`