Merge branch 'master' into develop

Conflicts: config/mail.php
2015-10-30 18:17:48 +00:00
parent ed18fd99fd e21667f2a6
commit 1aefbc9a54
1 changed files with 2 additions and 1 deletions
--- a/config/queue.php
+++ b/config/queue.php
@@ -87,7 +87,8 @@ return [
    */

    'failed' => [
-        'database' => 'mysql', 'table' => 'failed_jobs',
+        'database'  => env('DB_CONNECTION', 'mysql'),
+        'table' => 'failed_jobs',
    ],

 ];