Merge branch 'master' into develop

2016-02-05 14:33:51 +00:00 · 2016-02-05 14:33:51 +00:00 · 6654309ed2
parent e18a57c1ff 7aa988d491
commit 6654309ed2
1 changed files with 1 additions and 0 deletions
--- a/config/database.php
+++ b/config/database.php
@ -62,6 +62,7 @@
            'collation' => 'utf8_unicode_ci',
            'prefix'    => '',
            'strict'    => false,
+            'engine'    => null,
        ],

        'pgsql' => [