Merge pull request #6 from squeed/merge-docs
authorCasey Callendrello <casey.callendrello@coreos.com>
Fri, 19 May 2017 14:16:01 +0000 (16:16 +0200)
committerGitHub <noreply@github.com>
Fri, 19 May 2017 14:16:01 +0000 (16:16 +0200)
commitdcf7368eeab15e2affc6256f0bb1e84dd46a34de
treeb4d282c4d436ee6ccfa7b9884480f1f47af01b4e
parent0c1c1b7d8c98ccfe7fe74575e8807c133ac72815
parentc9e3fc4890767a619624e804029a8f5975ff28a3
Merge pull request #6 from squeed/merge-docs

Documentation folder merge