]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48113ab 547a90c)
[master] Merge branch 'trac5303'
authorMarcin Siodelski <marcin@isc.org>
Thu, 29 Jun 2017 15:53:18 +0000 (17:53 +0200)
committerMarcin Siodelski <marcin@isc.org>
Thu, 29 Jun 2017 15:53:18 +0000 (17:53 +0200)
# Conflicts:
# src/lib/http/connection.cc


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