Merge branch 'master' into develop

43a2e8f2 · Taylor Otwell · 5e24837f · 9b44c33c · 43a2e8f2
Commit 43a2e8f2 authored May 31, 2013 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

composer.json composer.json +1 -1

No files found.
--- a/composer.json
+++ b/composer.json
 {
-    "name": "laravel/framework",
+    "name": "laravel/laravel",
    "description": "The Laravel Framework.",
    "keywords": ["framework", "laravel"],
 	"require": {