diff options
author | Stanislav Malyshev <stas@php.net> | 2018-11-28 15:46:39 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2018-11-28 15:46:39 -0800 |
commit | 87bf84c8c7224ac85de77f7552068d4fce8b95c4 (patch) | |
tree | 8aa4ee044100afdd7796f2b62c94012552a8ad5a /ext/pcre/php_pcre.c | |
parent | aed4065aa64f42276609338079a156a6168235d2 (diff) | |
parent | d8765852e0400ee2ce8ae9e2177c42731d4539d8 (diff) | |
download | php-git-87bf84c8c7224ac85de77f7552068d4fce8b95c4.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Add DISPLAY_INI_ENTRIES for imap
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions