Merge branch 'master' into gva_gormv2_dev

3 years ago · 496bbeb0e3
2 changed files with 4 additions and 4 deletions
--- a/server/config.docker.yaml
+++ b/server/config.docker.yaml
@ -61,8 +61,8 @@ mysql:
  password: ''
  max-idle-conns: 10
  max-open-conns: 100
  log-mode: false
  log-zap: ""
  log-mode: ""
  log-zap: false
 # local configuration
 local:
--- a/server/config.yaml
+++ b/server/config.yaml
@ -62,8 +62,8 @@ mysql:
  password: ''
  max-idle-conns: 10
  max-open-conns: 100
  log-mode: false
  log-zap: ""
  log-mode: ""
  log-zap: false
 # local configuration
 local: