Merge pull request #1775 from doctrine/2.11.x-merge-up-into-2.12.x_SDmpjm0o

Merge release 2.11.4 into 2.12.x

Author: dmaicher

.symfony.bundle.yaml

@@ -10,6 +10,6 @@ branches:
 maintained_branches:
     - "2.11.x"
     - "2.12.x"
-doc_dir: "Resources/doc/"
+doc_dir: { "2.11.x": "Resources/doc/", "2.12.x": "docs/" }
 current_branch: "2.11.x"
 dev_branch: "2.12.x"