Merge branch '2.3' into develop

2019-03-07 16:21:03 +02:00
parent 9572ff84ea 267ec9cccc
commit 95317725ce
13 changed files with 69 additions and 13 deletions
--- a/server/core/service.cc
+++ b/server/core/service.cc
@ -1439,7 +1439,7 @@ bool Service::dump_config(const char* filename) const
        for (const auto& f : m_filters)
        {
            dprintf(file, "%s%s", sep, f->name.c_str());
-            sep = ",";
+            sep = "|";
        }

        dprintf(file, "\n");