diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-06-27 12:32:58 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-06-27 12:32:58 -0700 |
| commit | ec82c6b4e1048e5c207799fb4424e9728eb20173 (patch) | |
| tree | b1d199c2869f3d06955e940f5bbc56305befa766 | |
| parent | b5fc4dbf210fdbf46b037996c8479d1844e81f5d (diff) | |
| parent | b8487b6a7dcf102dd2015105b54279dad701b97b (diff) | |
| download | php-git-ec82c6b4e1048e5c207799fb4424e9728eb20173.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix the fix for #72403 on nl2br
5.5.38 now
Conflicts:
ext/standard/string.c
0 files changed, 0 insertions, 0 deletions