diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-06-27 12:32:11 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-06-27 12:32:11 -0700 |
| commit | b8487b6a7dcf102dd2015105b54279dad701b97b (patch) | |
| tree | f38501ca52e215d94f0453d84c81064cdf406d3a /ext/mbstring/php_mbregex.c | |
| parent | 1314db71091a171e9c2a6b27a4a74c628e76ada9 (diff) | |
| parent | 25bd11cf271f801efa346195d540f3d8e3bcb0ef (diff) | |
| download | php-git-b8487b6a7dcf102dd2015105b54279dad701b97b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix the fix for #72403 on nl2br
5.5.38 now
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
0 files changed, 0 insertions, 0 deletions