]> 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: 8327f0f d9215fa)
Merge branch '1.2-resync' into '1.2'
authorOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 10:12:43 +0000 (12:12 +0200)
committerOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 10:12:43 +0000 (12:12 +0200)
1.2 resync with master

See merge request !258


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