conflict resolved

This commit is contained in:
Olivier PARPAILLON
2024-11-20 12:53:20 +01:00
10 changed files with 185 additions and 14 deletions

2
composer.lock generated
View File

@@ -10273,7 +10273,7 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
"php": ">=8.1",
"php": ">=8.2",
"ext-ctype": "*",
"ext-iconv": "*"
},