Merge branch '2.6' into 2.7

fabpot · fabpot · commit 20516f547e32 · 2014-12-16T12:29:34.000+01:00
* 2.6:
  Add preview error route to dev firewall
diff --git a/app/config/security.yml b/app/config/security.yml
@@ -5,7 +5,7 @@ security:
 
     firewalls:
         dev:
-            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            pattern: ^/(_(profiler|wdt|error)|css|images|js)/
             security: false
 
         default:
