Merged master, fixed BATS conflict

This commit is contained in:
Steve Kamerman committed 2017-03-06 10:48:12 -05:00
commit ad9af2884d
100 files changed
+2620 -1904

No files matched your search

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