Merge branch 'feature/vuejs' into feature/vuejs-account

2018-07-02 21:01:04 -07:00 · 2018-07-02 21:01:04 -07:00 · 603b8a3094
commit 603b8a3094
parent 7711b697ad 48cb01f438
52 changed files with 666 additions and 529 deletions
--- a/config/database.php
+++ b/config/database.php
@ -34,6 +34,7 @@ return [
        'mysql' => [
            'driver' => 'mysql',
            'host' => env('DB_HOST', '127.0.0.1'),
+            'unix_socket' => env('DB_SOCKET'),
            'port' => env('DB_PORT', '3306'),
            'database' => env('DB_DATABASE', 'panel'),
            'username' => env('DB_USERNAME', 'pterodactyl'),