diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-11-14 14:58:45 +0100 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-11-14 14:59:30 +0100 |
commit | 9a2bd2f4530412f04dbb86becf9783eb5335be7a (patch) | |
tree | 312617701fd017bcb1b6f6bcfd38b2471d154508 /Zend/zend_objects_API.c | |
parent | 8a11c9ee7696bcf7d57014032333eb5eb5f42fab (diff) | |
parent | 211c6189f6921c17ec55a3b422ab5fa4bdd5e88f (diff) | |
download | php-git-9a2bd2f4530412f04dbb86becf9783eb5335be7a.tar.gz |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR
Diffstat (limited to 'Zend/zend_objects_API.c')
0 files changed, 0 insertions, 0 deletions