git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 398710b bcc189e)
Merge pull request #212 from squaremo/more-contrib
authorStefan Junker <steveeJ@users.noreply.github.com>
Thu, 19 May 2016 16:38:57 +0000 (18:38 +0200)
committerStefan Junker <steveeJ@users.noreply.github.com>
Thu, 19 May 2016 16:38:57 +0000 (18:38 +0200)
docs: Mention license headers and doc contributions


Trivial merge
CNI changes for updated IPAM