Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2016-08-04 07:49:02 -05:00
commit d0f90f9bfd
2 changed files with 6 additions and 1 deletions

View File

@ -1,5 +1,5 @@
APP_ENV=local APP_ENV=local
APP_KEY=SomeRandomString APP_KEY=
APP_DEBUG=true APP_DEBUG=true
APP_LOG_LEVEL=debug APP_LOG_LEVEL=debug
APP_URL=http://localhost APP_URL=http://localhost

View File

@ -162,6 +162,11 @@
Illuminate\Translation\TranslationServiceProvider::class, Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class, Illuminate\View\ViewServiceProvider::class,
/*
* Package Service Providers...
*/
/* /*
* Application Service Providers... * Application Service Providers...