Merge branch 'master' into development

CHH · Feb 12, 2014 · b740b7a · b740b7a
2 parents 91d9aff + 53a00e9
commit b740b7a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/conf/nginx/symfony2.conf.erb b/conf/nginx/symfony2.conf.erb
@@ -14,7 +14,7 @@ location @rewriteapp {
     rewrite ^(.*)$ /app.php/$1 last;
 }
 
-location ~ ^/app\.php(/|$) {
+location ~ ^/(app|app_dev|config)\.php(/|$) {
     fastcgi_pass php;
     fastcgi_split_path_info ^(.+\.php)(/.*)$;
     include fastcgi_params;