Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell
2014-08-22 08:30:57 -05:00

View File

@@ -3,6 +3,7 @@
"description": "The Laravel Framework.", "description": "The Laravel Framework.",
"keywords": ["framework", "laravel"], "keywords": ["framework", "laravel"],
"license": "MIT", "license": "MIT",
"type": "project",
"require": { "require": {
"laravel/framework": "4.3.*" "laravel/framework": "4.3.*"
}, },