Merge pull request docker#275 from ManoMarks/master

Remove HoL 2016 and add in HoL from DCUS 2017
zhuohuwu0603 · May 12, 2017 · 72b5f0f · 72b5f0f
2 parents a6aafb6 + a1d53ea
commit 72b5f0f
Show file tree

Hide file tree

Showing 614 changed files with 66,641 additions and 2,600 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@ This repo contains [Docker](https://docker.com) labs and tutorials authored both
 * [Building a 12 Factor app with Docker](12factor/README.md)
 * [Docker Security](security/README.md)
 * [Docker Networking](networking/)
+* [Hands-on Labs from DockerCon US 2017](dockercon-us-2017/)
 
 
 #### Community tutorials

diff --git a/dockercon-us-2016/README.md b/dockercon-us-2016/README.md
diff --git a/dockercon-us-2016/docker-cloud/README.md b/dockercon-us-2016/docker-cloud/README.md