Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2016-06-04 09:37:46 -05:00
commit edc5cee942
3 changed files with 5 additions and 2 deletions

View File

@ -1,6 +1,7 @@
APP_ENV=local APP_ENV=local
APP_DEBUG=true
APP_KEY=SomeRandomString APP_KEY=SomeRandomString
APP_DEBUG=true
APP_LOG_LEVEL=debug
APP_URL=http://localhost APP_URL=http://localhost
DB_CONNECTION=mysql DB_CONNECTION=mysql

View File

@ -110,6 +110,8 @@
'log' => env('APP_LOG', 'single'), 'log' => env('APP_LOG', 'single'),
'log_level' => env('APP_LOG_LEVEL', 'debug'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Autoloaded Service Providers | Autoloaded Service Providers

View File

@ -1,6 +1,6 @@
<?php <?php
class TestCase extends Illuminate\Foundation\Testing\TestCase abstract class TestCase extends Illuminate\Foundation\Testing\TestCase
{ {
/** /**
* The base URL to use while testing the application. * The base URL to use while testing the application.