]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac5212' (config comments # -> //)
authorTomek Mrugalski <tomasz@isc.org>
Tue, 30 May 2017 17:32:11 +0000 (19:32 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Tue, 30 May 2017 17:32:11 +0000 (19:32 +0200)
commit5f7916ddf10cf459a4649d48907d79bfcc9010e0
treebe04fcfcbf59b10048eea66263bdba11f8b8ba02
parent1f89f014156669f0521fa13e56a2ec6e05285d6b
parent5812c3bcb15942add33a1195ca2eda97988cbb90
[master] Merge branch 'trac5212' (config comments # -> //)

# Conflicts:
# doc/examples/kea4/reservations.json
# doc/examples/kea6/reservations.json
doc/examples/kea4/reservations.json
doc/examples/kea6/reservations.json