Merge branch 'master' into stable

This commit is contained in:
Ric Harvey
2015-06-01 12:37:14 +01:00

View File

@@ -8,7 +8,7 @@ If you have any improvements please submit a pull request.
The Docker hub build can be found here: [https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/](https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/) The Docker hub build can be found here: [https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/](https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/)
## Nginx Versions ## Nginx Versions
- Mainline Version: **1.9.0** - Mainline Version: **1.9.1**
- Stable Version: **1.8.0** - Stable Version: **1.8.0**
- *Latest = Mainline Version* - *Latest = Mainline Version*