]> git.ipfire.org Git - thirdparty/kea.git/commit
[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)
commit280de81cfe957ccab8a28074bdb0a4bc0e45104e
tree48b8fca5b42fc9f6bb3e1fb123e27a91e5ec2d9f
parent4cb3628a371176ca1e2cd1d770791cbfcd94172a
parent22a32284955f046eefa7eceda6b2d4c93368734a
[master] Merge branch 'trac5198' (default config improvements)

# Conflicts:
# doc/examples/ddns/sample1.json