Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Baptiste Donaux
2016-03-23 08:52:58 +01:00
2 changed files with 7 additions and 3 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
FROM nginx:1.9.9
FROM nginx:1.9.12
MAINTAINER Jason Wilder mail@jasonwilder.com
# Install wget and install/updates certificates