Merge remote-tracking branch 'origin/master'
# Conflicts: # .env-example
This commit is contained in:
@@ -8,7 +8,7 @@ APP_DEFAULT_TIMEZONE = Asia/Shanghai
|
||||
# 语言
|
||||
LANG_DEFAULT_LANG = zh-cn
|
||||
|
||||
# 数据库(config/thinkorm.php)
|
||||
# 数据库(config/thinkorm.php/database.php)
|
||||
DATABASE_DRIVER = mysql
|
||||
DATABASE_TYPE = mysql
|
||||
DATABASE_HOSTNAME = 127.0.0.1
|
||||
|
||||
Reference in New Issue
Block a user