Skip to content

Commit fc1bc9c

Browse files
iluuu1994iluuu1994
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: [skip ci] Unparallelize imap
2 parents 270e3da + 20654ce commit fc1bc9c

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)