Merge branch 'master' into develop

taylorotwell · taylorotwell · commit 5e24837f43f1 · 2013-05-31T08:29:42.000-05:00
diff --git a/composer.json b/composer.json
@@ -1,4 +1,7 @@
 {
+    "name": "laravel/framework",
+    "description": "The Laravel Framework.",
+    "keywords": ["framework", "laravel"],
 	"require": {
 		"laravel/framework": "4.1.*"
 	},
diff --git a/public/index.php b/public/index.php
@@ -26,7 +26,7 @@
 |--------------------------------------------------------------------------
 |
 | We need to illuminate PHP development, so let's turn on the lights.
-| This bootstrap the framework and gets it ready for use, then it
+| This bootstraps the framework and gets it ready for use, then it
 | will load up this application so that we can run it and send
 | the responses back to the browser and delight these users.
 |

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`{`
	`2`	`+ "name": "laravel/framework",`
	`3`	`+ "description": "The Laravel Framework.",`
	`4`	`+ "keywords": ["framework", "laravel"],`
`2`	`5`	`"require": {`
`3`	`6`	`"laravel/framework": "4.1.*"`
`4`	`7`	`},`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`\|--------------------------------------------------------------------------`
`27`	`27`	`\|`
`28`	`28`	`\| We need to illuminate PHP development, so let's turn on the lights.`
`29`		`-\| This bootstrap the framework and gets it ready for use, then it`
	`29`	`+\| This bootstraps the framework and gets it ready for use, then it`
`30`	`30`	`\| will load up this application so that we can run it and send`
`31`	`31`	`\| the responses back to the browser and delight these users.`
`32`	`32`	`\|`