From: Štěpán Balážik Date: Tue, 11 Aug 2020 14:31:24 +0000 (+0200) Subject: Merge branch 'ci-deckard-divergent-commit' into 'master' X-Git-Tag: v5.1.3~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19d3ecac0fd9839c1afec539986dbbd49d452c5a;p=thirdparty%2Fknot-resolver.git Merge branch 'ci-deckard-divergent-commit' into 'master' ci: fix divergent commit in Deckard submodule See merge request knot/knot-resolver!1036 --- 19d3ecac0fd9839c1afec539986dbbd49d452c5a