Merge branch 'master' of github.com:yeasy/docker_practice

This commit is contained in:
Baohua Yang 2014-12-21 19:24:45 +08:00
commit 201a2180a3
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
_book/ _book/
*.swp *.swp
*.edx *.edx
.DS_Store

View File

@ -79,5 +79,5 @@
* [Nginx](appendix_repo/nginx.md) * [Nginx](appendix_repo/nginx.md)
* [WordPress](appendix_repo/wordpress.md) * [WordPress](appendix_repo/wordpress.md)
* [Node.js](appendix_repo/nodejs.md) * [Node.js](appendix_repo/nodejs.md)
* [附录三:资源链接](appendix_resources/README.md) * [附录三:有用的资源](appendix_resources/README.md)