Skip to content

Commit 842fde2

Browse files
committed
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Enable $ replacement in exif, ldap, pdo_pgsql and tidy Update NEWS
2 parents 658f7d7 + 0678dc8 commit 842fde2

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ sapi/nsapi/nsapi.c ident
2222
sapi/continuity/capi.c ident
2323
Zend/RFCs/002.txt ident
2424
Zend/RFCs/003.txt ident
25+
ext/exif/exif.c ident
26+
ext/ldap/ldap.c ident
27+
ext/pdo_pgsql/pdo_pgsql.c ident
28+
ext/tidy/tidy.c ident
2529
NEWS merge=NEWS
2630
UPGRADING merge=NEWS
2731
UPGRADING.INTERNALS merge=NEWS

0 commit comments

Comments
 (0)