Merge branch '1.9'

ezsystems · May 4, 2017 · df80b3b · df80b3b
2 parents c37b3fd + 4f77568
commit df80b3b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -57,6 +57,7 @@ framework:
     router:
         resource: "%kernel.root_dir%/config/routing.yml"
         strict_requirements: ~
+    csrf_protection: ~
     form:
         csrf_protection:
             enabled: true
@@ -70,7 +71,6 @@ framework:
     templating:      { engines: ['twig'] } #assets_version: SomeVersionScheme
     default_locale:  "%locale_fallback%"
     trusted_hosts:   ~
-    trusted_proxies: ~
     session:
         # handler_id set to null will use default session handler from php.ini
         handler_id:  ~