Merge remote-tracking branch 'origin/2.x' into 2-to-3

doctrine · Jul 3, 2024 · c44f2da · c44f2da
2 parents 916ccd1 + 50f6483
commit c44f2da
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -50,6 +50,14 @@ Version 3
 Version 2
 =========
 
+2.5.1
+-----
+
+* Add conflicts for Jackalope `2.*` packages to composer.json as they have unsupported BC breaks.
+* Fix dependencies: phpcr-odm 2.0 has BC breaks not supported by this legacy version of the bundle.
+
+To use phpcr-odm 2 or Jackalope 2, please use version 3 of this bundle.
+
 2.5.0
 -----