]> 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: 59d5adf 68535b7)
Merge branch '1.2.0-dev' into 'master'
authorOndřej Surý <ondrej.sury@nic.cz>
Wed, 14 Dec 2016 12:44:50 +0000 (13:44 +0100)
committerOndřej Surý <ondrej.sury@nic.cz>
Wed, 14 Dec 2016 12:44:50 +0000 (13:44 +0100)
Move the version to 1.2.0-dev

Just marking this as 1.2.0-dev

See merge request !98


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