]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit
Merge branch '1.2' into 'master'
authorOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 14:10:22 +0000 (16:10 +0200)
committerOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 14:10:22 +0000 (16:10 +0200)
commitb67801061acbd5fc1dbdc6ebc272fcb261bd108a
tree9b1b2273a31990cf1b26e5d3d80859a071b3ffbc
parent1590015c253006be11ae762842635027da1e0a41
parentcbfb170c069db22a3df3cfdbe10be114d025e8f3
Merge branch '1.2' into 'master'

Sync 1.2 branch to master

See merge request !268