Skip to content

Commit 76e26c6

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: [skip ci] Unparallelize imap
2 parents 3c063ab + fc1bc9c commit 76e26c6

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

ext/imap/tests/CONFLICTS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
imap

ext/standard/tests/mail/CONFLICTS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
imap

0 commit comments

Comments
 (0)