Merge branch 'master' of github.com:illuminate/app

taylorotwell · taylorotwell · commit 87fa961813cd · 2012-07-09T23:08:23.000-05:00
diff --git a/app/routes.php b/app/routes.php
@@ -6,9 +6,8 @@
 |--------------------------------------------------------------------------
 |
 | Here is where you can register all of the routes for your application.
-| It's a breeze. Just tell Illuminate which URIs it should respond to
-| and give it a Closure to execute when that URI is accessed. It is
-| a walk in the park. Enjoy the simplicity of HTTP based routing.
+| It's a breeze. Just tell Illuminate the URIs it should respond to
+| and give it the Closure to execute when that URI is requested.
 |
 */
 
diff --git a/composer.json b/composer.json
@@ -4,5 +4,6 @@
 	},
 	"autoload": {
 		"classmap": ["app/tests/TestCase.php"]
-	}
+	},
+	"minimum-stability": "dev"
 }

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,8 @@`
`6`	`6`	`\|--------------------------------------------------------------------------`
`7`	`7`	`\|`
`8`	`8`	`\| Here is where you can register all of the routes for your application.`
`9`		`-\| It's a breeze. Just tell Illuminate which URIs it should respond to`
`10`		`-\| and give it a Closure to execute when that URI is accessed. It is`
`11`		`-\| a walk in the park. Enjoy the simplicity of HTTP based routing.`
	`9`	`+\| It's a breeze. Just tell Illuminate the URIs it should respond to`
	`10`	`+\| and give it the Closure to execute when that URI is requested.`
`12`	`11`	`\|`
`13`	`12`	`*/`
`14`	`13`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@`
`4`	`4`	`},`
`5`	`5`	`"autoload": {`
`6`	`6`	`"classmap": ["app/tests/TestCase.php"]`
`7`		`- }`
	`7`	`+ },`
	`8`	`+ "minimum-stability": "dev"`
`8`	`9`	`}`