Merge branch 'master' into develop

2016-08-04 07:49:02 -05:00 · 2016-08-04 07:49:02 -05:00 · d0f90f9bfd
parent ab453a7e82 14f79f19e3
commit d0f90f9bfd
2 changed files with 6 additions and 1 deletions
--- a/.env.example
+++ b/.env.example
@ -1,5 +1,5 @@
 APP_ENV=local
-APP_KEY=SomeRandomString
+APP_KEY=
 APP_DEBUG=true
 APP_LOG_LEVEL=debug
 APP_URL=http://localhost
--- a/config/app.php
+++ b/config/app.php
@ -162,6 +162,11 @@
        Illuminate\Translation\TranslationServiceProvider::class,
        Illuminate\Validation\ValidationServiceProvider::class,
        Illuminate\View\ViewServiceProvider::class,
+        
+        /*
+         * Package Service Providers...
+         */
+         

        /*
         * Application Service Providers...