Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit 80f585093961 · 2019-05-29T10:56:48.000+02:00
* 4.4:
  fix typo
  [Translation] fix dep
diff --git a/composer.json b/composer.json
@@ -120,7 +120,7 @@
     },
     "conflict": {
         "masterminds/html5": "<2.6",
-        "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
+        "phpdocumentor/reflection-docblock": "<3.2.2",
         "phpdocumentor/type-resolver": "<0.3.0",
         "phpunit/phpunit": "<5.4.3"
     },
