Merge remote-tracking branch 'origin/MAGETWO-59547' into pr-2.0

Sergey Shvets · Sergey Shvets · commit ff1e81666639 · 2016-10-17T13:56:02.000+03:00
diff --git a/nginx.conf.sample b/nginx.conf.sample
@@ -95,7 +95,6 @@ location /static/ {
     location ~ ^/static/version {
         rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last;
     }
-
     location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
         add_header Cache-Control "public";
         add_header X-Frame-Options "SAMEORIGIN";

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,6 @@ location /static/ {`
`95`	`95`	`location ~ ^/static/version {`
`96`	`96`	`rewrite ^/static/(version\d/)?(.)$ /static/$2 last;`
`97`	`97`	`}`
`98`		`-`
`99`	`98`	`location ~* \.(ico\|jpg\|jpeg\|png\|gif\|svg\|js\|css\|swf\|eot\|ttf\|otf\|woff\|woff2)$ {`
`100`	`99`	`add_header Cache-Control "public";`
`101`	`100`	`add_header X-Frame-Options "SAMEORIGIN";`