Skip to content

Commit cbd1dc3

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents 04f6457 + 9faab46 commit cbd1dc3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

patches/8.5/cmake.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ index e691bd3964b..191fcd70eb5 100644
153153
+CMakeLists.txt.user
154154
+CMakeScripts/
155155
diff --git a/run-tests.php b/run-tests.php
156-
index a90681c7ff7..fb8e59d7d34 100755
156+
index 03616272567..2d7558391eb 100755
157157
--- a/run-tests.php
158158
+++ b/run-tests.php
159159
@@ -848,10 +848,12 @@ function write_information(array $user_tests, $phpdbg): void

0 commit comments

Comments
 (0)