Squashed commit of the following:

commit 7daedd241246bd11f371a8c93394796f8f5ec4cb
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Fri Aug 11 21:01:17 2017 +0100

    Bring in the latest changes from upstream repo laravel/laravel
This commit is contained in:
Jonny Barnes 2017-08-11 21:02:03 +01:00
parent b695b5be8c
commit 2b5e17ab4e
27 changed files with 132 additions and 55 deletions

View file

@ -67,6 +67,17 @@ return [
'sslmode' => 'prefer',
],
'sqlsrv' => [
'driver' => 'sqlsrv',
'host' => env('DB_HOST', 'localhost'),
'port' => env('DB_PORT', '1433'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8',
'prefix' => '',
],
'travis' => [
'driver' => 'pgsql',
'host' => 'localhost',
@ -106,7 +117,7 @@ return [
'redis' => [
'cluster' => false,
'client' => 'predis',
'default' => [
'host' => env('REDIS_HOST', 'localhost'),