cief/izyim-api
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/izyim-api.git synced 2026-08-19 04:24:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/warehouses

Browse Source 
# Conflicts:
#	app/Http/Controllers/CompanyController.php
#	package-lock.json
#	routes/api.php
This commit is contained in:
Jack Goh
2018-06-20 11:32:02 +08:00
parent 256014c75b eee806bd6d
commit c59fb24537
16 changed files with 368 additions and 23251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/database.php
+3 -3
View File
@@ -43,9 +43,9 @@ return [
'driver' => 'mysql',
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'forgzze'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'database' => env('DB_DATABASE', 'izyim1'),
'username' => env('DB_USERNAME', 'izyim1'),
'password' => env('DB_PASSWORD', 'izyim1'),
'unix_socket' => env('DB_SOCKET', ''),
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',