Merge branch '3.1' into 3.2

nicolas-grekas · nicolas-grekas · commit 0b04acc18204 · 2017-01-24T13:58:58.000+01:00
* 3.1:
  [Serializer] Add missing conflict for property-info&lt;3.1
diff --git a/composer.json b/composer.json
@@ -31,6 +31,7 @@
     },
     "conflict": {
         "symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4",
+        "symfony/property-info": "<3.1",
         "symfony/yaml": "<3.1"
     },
     "suggest": {
