Commit 15982efd authored by Taylor Otwell's avatar Taylor Otwell

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

parents b2324a75 713f70a7
......@@ -74,6 +74,7 @@ If you have created indexes on tables using the Laravel migration system and you
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 @@ If you are using Redis, add the "database" option to your Redis connection confi
'port' => 6379,
'database' => 0
),
),
\ No newline at end of file
),
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment