Merge branch 'master' into develop

6654309e · Graham Campbell · e18a57c1 · 7aa988d4 · 6654309e
Commit 6654309e authored Feb 05, 2016 by Graham Campbell
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

database.php config/database.php +1 -0

No files found.
--- a/config/database.php
+++ b/config/database.php
@@ -62,6 +62,7 @@ return [
            'collation' => 'utf8_unicode_ci',
            'prefix'    => '',
            'strict'    => false,
+            'engine'    => null,
        ],

        'pgsql' => [