Merge laravel 5.4 into develop.

This commit is contained in:
James Cole committed 2017-02-05 16:20:02 +01:00
commit f863c01a1d
162 files changed
+1063 -6274

No files matched your search

+2 -2
View File
@@ -49,9 +49,9 @@ class Kernel extends HttpKernel
*/
protected $bootstrappers
= [
'Illuminate\Foundation\Bootstrap\DetectEnvironment',
'Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables',
'Illuminate\Foundation\Bootstrap\LoadConfiguration',
'FireflyIII\Bootstrap\ConfigureLogging',
//'FireflyIII\Bootstrap\ConfigureLogging',
'Illuminate\Foundation\Bootstrap\HandleExceptions',
'Illuminate\Foundation\Bootstrap\RegisterFacades',
'Illuminate\Foundation\Bootstrap\RegisterProviders',