Merge branch 'master' of github.com:laravel/laravel
This commit is contained in:
commit
15982efd11
|
|
@ -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:
|
Add the following to the **aliases** array in your **application/config/application.php** file:
|
||||||
|
|
||||||
'Eloquent' => 'Laravel\\Database\\Eloquent\\Model',
|
'Eloquent' => 'Laravel\\Database\\Eloquent\\Model',
|
||||||
|
'Blade' => 'Laravel\\Blade',
|
||||||
|
|
||||||
### Update Eloquent many-to-many tables.
|
### Update Eloquent many-to-many tables.
|
||||||
|
|
||||||
|
|
@ -101,4 +102,4 @@ ### Add **database** option to your Redis configuration.
|
||||||
'port' => 6379,
|
'port' => 6379,
|
||||||
'database' => 0
|
'database' => 0
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue