Merge branch 'test' into 'dev'

# Conflicts: # .gitlab-ci.yml
2022-03-02 10:27:32 +00:00 · 2022-03-02 10:27:32 +00:00 · 7570fd470c
parent 8fee5e2ca7 c10ee395d0
commit 7570fd470c
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -1,3 +1,3 @@
 FROM nginx:latest
 COPY ./build/web /usr/share/nginx/html/
-ENTRYPOINT ["nginx", "-g", "daemon off;"]
+ENTRYPOINT ["nginx", "-g", "daemon off;"]