merge in upstream commit magento/magento2@631bd09 - add client side c…

…aching to translation files (add json to static files mime type)
aj-adl · Oct 31, 2018 · c2aa615 · c2aa615
1 parent 2e19bbd
commit c2aa615
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/serve-magento.sh b/serve-magento.sh
@@ -99,7 +99,7 @@ location /static/ {
         rewrite ^/static/(version[^/]+/)?(.*)$ /static/\$2 last;
     }
 
-    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
+    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|json)$ {
         add_header Cache-Control 'public';
         add_header X-Frame-Options 'SAMEORIGIN';
         expires +1y;