Merge branch 'master' into develop

5b1e511a · Taylor Otwell · e52be1f9 · 55053de6 · 5b1e511a
Commit 5b1e511a authored Aug 22, 2014 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 0 deletions

composer.json
+1 -0

No files found.
--- 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.*"
 	},