Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Baptiste Donaux 2016-02-25 09:59:04 +01:00
commit 47631eb5de

View file

@ -1,4 +1,4 @@
FROM nginx:1.9.6 FROM nginx:1.9.9
MAINTAINER Jason Wilder mail@jasonwilder.com MAINTAINER Jason Wilder mail@jasonwilder.com
# Install wget and install/updates certificates # Install wget and install/updates certificates