]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit
Merge branch 'ci-deckard-divergent-commit' into 'master' obs-knot-dns-deve-jq0xxt/deployments/1010 obs-knot-dns-deve-jq0xxt/deployments/1012 obs-knot-resolver-es11k1/deployments/1011 obs-knot-resolver-es11k1/deployments/1013
authorŠtěpán Balážik <stepan.balazik@nic.cz>
Tue, 11 Aug 2020 14:31:24 +0000 (16:31 +0200)
committerŠtěpán Balážik <stepan.balazik@nic.cz>
Tue, 11 Aug 2020 14:31:24 +0000 (16:31 +0200)
commit19d3ecac0fd9839c1afec539986dbbd49d452c5a
tree3f1ba5878bfe602d6a789bea27f8e6bf0efbeb79
parent360c58f5dfbe5add1ad23d68168172a67d250a42
parent0015de687651105c257188bf53fcba6c0b20d74c
Merge branch 'ci-deckard-divergent-commit' into 'master'

ci: fix divergent commit in Deckard submodule

See merge request knot/knot-resolver!1036