Merge branch '10.x' into 11.x

# Conflicts: # CHANGELOG.md # composer.json
laravel · Mar 12, 2024 · a68a0b3 · a68a0b3
2 parents b4c5273 + 48cf0e6
commit a68a0b3
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -117,6 +117,7 @@
         "symfony/psr-http-message-bridge": "^7.0"
     },
     "conflict": {
+        "mockery/mockery": ">=1.6.8",
         "tightenco/collect": "<5.5.33"
     },
     "provide": {