gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

parent: 842bf559 | patch | commit | ignore whitespace

Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Marius Cramer

2015-03-26 0e899eee2bf3077f0dddd1655bad214bad2a62b1

Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

2 files modified

	install/tpl/nginx_apps.vhost.master	2 ●●●●● patch \| view \| raw \| blame \| history
	install/tpl/nginx_ispconfig.vhost.master	2 ●●●●● patch \| view \| raw \| blame \| history

 install/tpl/nginx_apps.vhost.master

@@ -12,7 +12,7 @@
        }

        # serve static files directly
        location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt)$ {
        location ~* ^.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt)$ {
               access_log        off;
        }


 install/tpl/nginx_ispconfig.vhost.master

@@ -19,7 +19,7 @@
        }

        # serve static files directly
        location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt)$ {
        location ~* ^.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt)$ {
               access_log        off;
        }

			@@ -12,7 +12,7 @@
			}

			# serve static files directly
			location ~* ^.+.(jpg\|jpeg\|gif\|css\|png\|js\|ico\|html\|xml\|txt)$ {
			location ~* ^.+\.(jpg\|jpeg\|gif\|css\|png\|js\|ico\|html\|xml\|txt)$ {
			access_log off;
			}

			@@ -19,7 +19,7 @@
			}

			# serve static files directly
			location ~* ^.+.(jpg\|jpeg\|gif\|css\|png\|js\|ico\|html\|xml\|txt)$ {
			location ~* ^.+\.(jpg\|jpeg\|gif\|css\|png\|js\|ico\|html\|xml\|txt)$ {
			access_log off;
			}