Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
1 changed files with 3 additions and 3 deletions
Showing only changes of commit f82c487416 - Show all commits

View File

@ -1,9 +1,9 @@
#blootstrap nginx conf #blootstrap nginx conf
server { server {
listen 80; listen 80 default_server;
server_name _;
location / { location / {
proxy_pass http://127.0.0.1:6699/; proxy_pass http://127.0.0.1:6699/;
proxy_set_header Host $host; proxy_set_header Host $host;