Merge pull request tengyifei#22 from tengyifei/nginx-1.7.12

Nginx 1.7.12
uwascan · Apr 19, 2015 · 9f01dce · 9f01dce
2 parents 1938879 + 80ef4df
commit 9f01dce
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Join the chat at https://gitter.im/tengyifei/openshift-cartridge-nginx-hhvm](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/tengyifei/openshift-cartridge-nginx-hhvm?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-Nginx 1.7.8 with HHVM 3.6.0
+Nginx 1.7.12 with HHVM 3.6.0
 
 Partly based on [pinodex/openshift-nginx-php-fpm](https://github.com/pinodex/openshift-nginx-php-fpm).
 

diff --git a/bin/control b/bin/control
diff --git a/versions/shared/usr/sbin/nginx b/versions/shared/usr/sbin/nginx