]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Wed, 28 Nov 2018 23:46:39 +0000 (15:46 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 28 Nov 2018 23:46:39 +0000 (15:46 -0800)
commit87bf84c8c7224ac85de77f7552068d4fce8b95c4
tree8aa4ee044100afdd7796f2b62c94012552a8ad5a
parentaed4065aa64f42276609338079a156a6168235d2
parentd8765852e0400ee2ce8ae9e2177c42731d4539d8
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Add DISPLAY_INI_ENTRIES for imap
ext/imap/php_imap.c