Merge remote-tracking branch 'origin/master'
# Conflicts: # task01.md
This commit is contained in:
commit
e9cfc67839
|
@ -98,7 +98,7 @@ DATABASES = {
|
||||||
'NAME': os.getenv('DB_DATABASE', 'bluewhale'),
|
'NAME': os.getenv('DB_DATABASE', 'bluewhale'),
|
||||||
'USER': os.getenv('DB_USER', 'bluewhale'),
|
'USER': os.getenv('DB_USER', 'bluewhale'),
|
||||||
'PASSWORD': os.getenv('DB_PASSWORD', 'bluewhale'),
|
'PASSWORD': os.getenv('DB_PASSWORD', 'bluewhale'),
|
||||||
'HOST': os.getenv('DB_HOST', '127.0.0.1'),
|
'HOST': os.getenv('DB_HOST', '192.168.10.211'),
|
||||||
'PORT': '3306',
|
'PORT': '3306',
|
||||||
'OPTIONS': {
|
'OPTIONS': {
|
||||||
'charset': 'utf8mb4',
|
'charset': 'utf8mb4',
|
||||||
|
|
Loading…
Reference in New Issue