diff options
| author | Joffrey F <joffrey@docker.com> | 2014-10-29 19:35:05 +0100 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2014-10-29 19:35:05 +0100 |
| commit | 37c8072f60412b1efdcdb0b5556bd87562e70cff (patch) | |
| tree | f7d2417d30f8d53ccae9cc6b2685693c95bf95d8 /README.md | |
| parent | 0d806d81b47041f3b4563e81438163cc3b56853d (diff) | |
| parent | 288e53b28b3eaf75260fb65befb9138aa62c49b8 (diff) | |
| download | docker-py-37c8072f60412b1efdcdb0b5556bd87562e70cff.tar.gz | |
Merge branch 'pause-unpause' of github.com:phensley/docker-py into phensley-pause-unpause
Conflicts:
README.md
tests/integration_test.py
tests/test.py
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -17,6 +17,7 @@ Documentation Full documentation is available in the `/docs/` directory. + License ------- Docker is licensed under the Apache License, Version 2.0. See LICENSE for full license text |