]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4c076b 380c3a7)
[master] Added conflict resolution discussion to D2 chapter in admin guide
authorThomas Markwalder <tmark@isc.org>
Tue, 24 Oct 2017 17:22:57 +0000 (13:22 -0400)
committerThomas Markwalder <tmark@isc.org>
Tue, 24 Oct 2017 17:22:57 +0000 (13:22 -0400)
    Merges in branch 'trac5275'


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