Merge branch 'master' into develop

2014-08-22 08:30:57 -05:00 · 2014-08-22 08:30:57 -05:00 · 5b1e511ab1
parent e52be1f98d 55053de667
commit 5b1e511ab1
1 changed files with 1 additions and 0 deletions
--- a/composer.json
+++ b/composer.json
@ -3,6 +3,7 @@
 	"description": "The Laravel Framework.",
 	"keywords": ["framework", "laravel"],
 	"license": "MIT",
+	"type": "project",
 	"require": {
 		"laravel/framework": "4.3.*"
 	},