]> 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: 53f6307 4a006d9)
Merge branch 'travis-fix' into 'master'
authorOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 11:04:30 +0000 (13:04 +0200)
committerOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 11:04:30 +0000 (13:04 +0200)
Travis fix

See merge request !260


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