Merge branch '3.1'

* 3.1: Fix deps merge
2016-10-14 11:45:08 +02:00 · 2016-10-14 11:45:08 +02:00 · 870c302199
commit 870c302199
parent 115a37999f af10027906
1 changed files with 1 additions and 1 deletions
--- 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"
    },