From: Petr Špaček <petr.spacek@nic.cz>
Date: Thu, 19 Dec 2019 09:06:29 +0000 (+0100)
Subject: Merge branch 'multiple-config-files' into 'master'
X-Git-Tag: v5.0.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df53eea4ff5e54d82e55329125a7552b0b107250;p=thirdparty%2Fknot-resolver.git

Merge branch 'multiple-config-files' into 'master'

daemon/main: support multiple config files

See merge request knot/knot-resolver!909
---

df53eea4ff5e54d82e55329125a7552b0b107250