]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge branch 'release-2-2-0' into 'master' v2.2.0
authorTomas Krizek <tomas.krizek@nic.cz>
Wed, 28 Mar 2018 11:33:39 +0000 (13:33 +0200)
committerTomas Krizek <tomas.krizek@nic.cz>
Wed, 28 Mar 2018 11:33:39 +0000 (13:33 +0200)
Release 2.2.0

See merge request knot/knot-resolver!535


Trivial merge