git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80f87ce 0a28931)
Merge pull request #91 from tomdee/patch-1
authorStefan Junker <steveeJ@users.noreply.github.com>
Tue, 5 Jan 2016 08:05:09 +0000 (09:05 +0100)
committerStefan Junker <steveeJ@users.noreply.github.com>
Tue, 5 Jan 2016 08:05:09 +0000 (09:05 +0100)
Fix docker example in README.md


Trivial merge
CNI changes for updated IPAM