diff options
| author | shin- <joffrey@dotcloud.com> | 2013-10-24 19:42:51 +0200 |
|---|---|---|
| committer | shin- <joffrey@dotcloud.com> | 2013-10-24 19:42:51 +0200 |
| commit | 40a2e8ad9343928142566bcab54e6a63ad486e95 (patch) | |
| tree | f25f1fdb2aea7f66351118187ccef9dba3eaf76f | |
| parent | 28b262337a5d57372c7a19a438849aa2fed88790 (diff) | |
| parent | e3dfa3384ad3cee3320c402222f68b667ebc8142 (diff) | |
| download | docker-py-40a2e8ad9343928142566bcab54e6a63ad486e95.tar.gz | |
Merge branch 'master' of https://github.com/shin-/docker-py
Conflicts:
README.md
| -rw-r--r-- | MANIFEST.in | 2 | ||||
| -rw-r--r-- | README.md | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 9e440ba..b447cb4 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ include requirements.txt include README.md -include LICENSE
\ No newline at end of file +include LICENSE @@ -1,7 +1,11 @@ docker-py ========= +<<<<<<< HEAD [](https://travis-ci.org/dotcloud/docker-py) +======= +[](https://travis-ci.org/shin-/docker-py) +>>>>>>> e3dfa3384ad3cee3320c402222f68b667ebc8142 An API client for docker written in Python |