Merge branch 'master' into devopslinks

This commit is contained in:
Julien Bisconti 2017-02-19 08:22:45 +02:00 committed by GitHub
commit 97b3f0fde8

View File

@ -19,6 +19,12 @@ Please note that this project is released with a [Contributor Code of Conduct](h
or you can or you can
#### Join the chat:
[![Join the chat at https://gitter.im/veggiemonk/awesome-docker](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/veggiemonk/awesome-docker)
or you can
#### ping us on twitter: #### ping us on twitter:
* [veggiemonk](https://twitter.com/veggiemonk) * [veggiemonk](https://twitter.com/veggiemonk)