Skip to content

Commit 75ce9b4

Browse files
Merge branch '4.4' into 5.1
* 4.4: fix merge Remove branch-version (keep them for contracts only) [HttpClient] relax auth bearer format requirements [PHPUnitBridge] Silence errors from mkdir() [DependencyInjection] Preload classes with union types correctly. [Serializer] fix decoding float XML attributes starting with 0 add missing dutch translations Support PHPUnit 8 and PHPUnit 9 in constraint compatibility trait Add expectDeprecation, expectNotice, expectWarning, and expectError to TestCase polyfill Add missing exporter function for PHPUnit 7 [Validator] Add missing romanian translations [Cache] Use correct expiry in ChainAdapter do not translate null placeholders or titles
1 parent 658146d commit 75ce9b4

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828
"/Tests/"
2929
]
3030
},
31-
"minimum-stability": "dev",
32-
"extra": {
33-
"branch-version": "5.1"
34-
}
31+
<<<<<<< HEAD:src/Symfony/Component/Notifier/composer.json
32+
"minimum-stability": "dev"
33+
=======
34+
"minimum-stability": "dev"
35+
>>>>>>> 4.4:src/Symfony/Component/Debug/composer.json
3536
}

0 commit comments

Comments
 (0)