Merge pull request #16225 from simplytunde/merged-master-dev-1.16

Merged master into dev-1.16
2019-09-12 08:58:27 -07:00
parent da51842bbb 7728c1476a
commit 72068890d3
224 changed files with 16055 additions and 2054 deletions
@@ -1,4 +1,4 @@
-FROM nginx:1.9.14
+FROM nginx:1.17.3

 RUN rm /etc/nginx/conf.d/default.conf
 COPY frontend.conf /etc/nginx/conf.d