Merge branch '3.1'

nicolas-grekas · nicolas-grekas · commit 870c30219904 · 2016-10-14T11:45:08.000+02:00
* 3.1:
  Fix deps merge
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.5.9",
         "symfony/event-dispatcher": "~2.8|~3.0",
-        "symfony/http-foundation": "~2.8.13|~3.0.8|~3.1.2|~3.2",
+        "symfony/http-foundation": "~2.8.13|~3.1.6|~3.2",
         "symfony/debug": "~2.8|~3.0",
         "psr/log": "~1.0"
     },
