]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1314db7 25bd11c)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 27 Jun 2016 19:32:11 +0000 (12:32 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 27 Jun 2016 19:32:11 +0000 (12:32 -0700)
* PHP-5.5:
  Fix the fix for #72403 on nl2br
  5.5.38 now

Conflicts:
configure.in
main/php_version.h

1  2 
ext/standard/string.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/string.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.