Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell
2013-10-30 09:46:39 -05:00
4 changed files with 8 additions and 8 deletions

View File

@@ -48,7 +48,7 @@ $app->bindInstallPaths(require __DIR__.'/paths.php');
| Load The Application
|--------------------------------------------------------------------------
|
| Here we will load the Illuminate application. We'll keep this is in a
| Here we will load this Illuminate application. We will keep this in a
| separate location so we can isolate the creation of an application
| from the actual running of the application with a given request.
|