Merge branch '2.3' into develop

2019-03-21 09:26:06 +02:00
parent 09ae5d741c 65b4ac7c1b
commit 2ba7e63e7e
18 changed files with 583 additions and 152 deletions
--- a/server/core/config.cc
+++ b/server/core/config.cc
@ -450,6 +450,7 @@ const char* config_pre_parse_global_params[] =
    CN_MAXLOG,
    CN_LOG_AUGMENTATION,
    CN_LOG_TO_SHM,
+    CN_SUBSTITUTE_VARIABLES,
    NULL
 };