]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cb3628 22a3228)
[master] Merge branch 'trac5198' (default config improvements)
authorTomek Mrugalski <tomasz@isc.org>
Mon, 24 Apr 2017 19:26:37 +0000 (21:26 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Mon, 24 Apr 2017 19:26:37 +0000 (21:26 +0200)
# Conflicts:
# doc/examples/ddns/sample1.json


Trivial merge
Mirror of https://github.com/isc-projects/kea.git