mirror of
https://github.com/php/php-src.git
synced 2026-03-29 11:42:17 +02:00
Merge branch 'PHP-5.3' of git.php.net:/php-src into 5.3
This commit is contained in:
2
.gitattributes
vendored
2
.gitattributes
vendored
@@ -21,4 +21,4 @@ sapi/nsapi/nsapi.c ident
|
||||
sapi/continuity/capi.c ident
|
||||
Zend/RFCs/002.txt ident
|
||||
Zend/RFCs/003.txt ident
|
||||
NEWS merge=ours
|
||||
NEWS merge=NEWS
|
||||
|
||||
Reference in New Issue
Block a user