Merge branch 'master' into develop

2013-09-06 23:51:46 -05:00
parent 73f37c6ce0 fbd93f6997
commit d94408d6c1
4 changed files with 16 additions and 2 deletions
--- a/composer.json
+++ b/composer.json
@@ -2,6 +2,7 @@
 	"name": "laravel/laravel",
 	"description": "The Laravel Framework.",
 	"keywords": ["framework", "laravel"],
+	"license": "MIT",
 	"require": {
 		"laravel/framework": "4.1.*"
 	},