]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
projects / thirdparty / knot-resolver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 360c58f 0015de6)
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)
ci: fix divergent commit in Deckard submodule

See merge request knot/knot-resolver!1036


Trivial merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git