Merge remote-tracking branch 'origin/MAGETWO-50855' into bugs

Natalia Momotenko · Natalia Momotenko · commit a34dda4449f7 · 2016-05-19T11:56:16.000+03:00
diff --git a/nginx.conf.sample b/nginx.conf.sample
@@ -165,7 +165,7 @@ location ~ (index|get|static|report|404|503)\.php$ {
 }
 
 gzip on;
-gzip_disable "MSIE [1-6]\.(?!.*SV1)";
+gzip_disable "msie6";
 
 gzip_comp_level 6;
 gzip_min_length 1100;

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ location ~ (index\|get\|static\|report\|404\|503)\.php$ {`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`gzip on;`
`168`		`-gzip_disable "MSIE [1-6]\.(?!.*SV1)";`
	`168`	`+gzip_disable "msie6";`
`169`	`169`
`170`	`170`	`gzip_comp_level 6;`
`171`	`171`	`gzip_min_length 1100;`