Merge branch 'master' of github.com:laravel/laravel

This commit is contained in:
Taylor Otwell 2012-03-29 14:21:31 -05:00
commit 15982efd11
1 changed files with 2 additions and 1 deletions

View File

@ -74,6 +74,7 @@ ### Add alias for Eloquent in your application configuration.
Add the following to the **aliases** array in your **application/config/application.php** file:
'Eloquent' => 'Laravel\\Database\\Eloquent\\Model',
'Blade' => 'Laravel\\Blade',
### Update Eloquent many-to-many tables.
@ -101,4 +102,4 @@ ### Add **database** option to your Redis configuration.
'port' => 6379,
'database' => 0
),
),
),