Merge remote-tracking branch 'upstream/master' into merged-master-dev-1.16

2019-09-05 03:12:16 -05:00
parent ebb0549f1c 9962db5ac3
commit b440eed496
191 changed files with 13190 additions and 1797 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