summaryrefslogtreecommitdiff
path: root/nginx/nginx.conf
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2017-04-04 12:02:41 +0200
committerschneefux <schneefux+commit@schneefux.xyz>2017-04-04 12:02:41 +0200
commita63d865cf351c36f0fcd3236072a8e6e00061e32 (patch)
treea3d6d977bb701f7f0eddc985cc4213b6fd90a120 /nginx/nginx.conf
parentc2d78419d7d70370255e983ee73a059d18f51bb7 (diff)
parent3a229577db319776f986f96cd9c60baf645e7b3e (diff)
downloadvaindock-a63d865cf351c36f0fcd3236072a8e6e00061e32.tar.gz
vaindock-a63d865cf351c36f0fcd3236072a8e6e00061e32.zip
Merge branch 'release/2.0.0' of https://gitlab.com/vainglorygame/vaindock into release/2.0.0
Diffstat (limited to 'nginx/nginx.conf')
-rw-r--r--nginx/nginx.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index dd8fbc3..b6bafec 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -36,4 +36,4 @@ http {
upstream websocket {
server vaindock_queue:15674;
}
-} \ No newline at end of file
+}