From: Petr Špaček Date: Tue, 9 Jul 2019 12:20:05 +0000 (+0000) Subject: Merge branch 'zimport' into 'master' X-Git-Tag: v4.1.0~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fenvironments%2Fobs-knot-resolver-es11k1%2Fdeployments%2F78;p=thirdparty%2Fknot-resolver.git Merge branch 'zimport' into 'master' Zone import/prefill Closes #474 See merge request knot/knot-resolver!840 --- 591e384b423bb4eb9fe73b8451c1563cf2ed6eec