Merge latest changes on master branch to dev branch #1

Merged
sixteenmillimeter merged 3 commits from master into dev 2017-09-28 17:30:53 +00:00
1 changed files with 4 additions and 3 deletions
Showing only changes of commit 0e134cfa6a - Show all commits

View File

@ -31,7 +31,7 @@ server {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
gzip on; gzip on;
gzip_comp_level 5; gzip_comp_level 5;
gzip_types text/plain text/html text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript application/json; gzip_types text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript application/json;
} }
#uncomment for static file server #uncomment for static file server
#location /static/ { #location /static/ {
@ -41,7 +41,8 @@ server {
#add_header Cache-Control "public"; #add_header Cache-Control "public";
#gzip on; #gzip on;
#gzip_comp_level 5; #gzip_comp_level 5;
#gzip_types text/plain text/html text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript application/json; #gzip_types text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript application/json;
#alias /var/node/blootstrap/static/; #use project location
#alias /var/node/intval3/static/;
#} #}
} }