Merge branch 'master' into develop

2013-05-31 08:30:47 -05:00 · 2013-05-31 08:30:47 -05:00 · 43a2e8f20e
parent 5e24837f43 9b44c33cb3
commit 43a2e8f20e
1 changed files with 1 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@ -1,5 +1,5 @@
 {
-    "name": "laravel/framework",
+    "name": "laravel/laravel",
    "description": "The Laravel Framework.",
    "keywords": ["framework", "laravel"],
 	"require": {