Merge branch '4.0' into 4.1

ibexa · Apr 22, 2022 · 0480a09 · 0480a09
2 parents 6a47b90 + 1ebfffc
commit 0480a09
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -66,6 +66,8 @@
         "ibexa/ci-scripts": "^0.2@dev"
     },
     "conflict": {
+        "doctrine/doctrine-bundle": "2.6.3",
+        "doctrine/persistence": "3.0.0",
         "gregwar/captcha-bundle": "2.2.0",
         "imagine/imagine": "1.3.0 || 1.3.1",
         "lexik/jwt-authentication-bundle": "2.12.0",