summaryrefslogtreecommitdiff
path: root/Zend/zend_objects_API.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2018-11-14 14:56:41 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2018-11-14 14:57:40 +0100
commit211c6189f6921c17ec55a3b422ab5fa4bdd5e88f (patch)
treec4d694ec9f2f99c0a0b2139a5d6b369df2c90a7f /Zend/zend_objects_API.c
parentce4eb8997651e04fa9284ac3a7e1a2fb2da7df9e (diff)
parenta56cdd0a824d439920548aaeae757cb2341bd4ec (diff)
downloadphp-git-211c6189f6921c17ec55a3b422ab5fa4bdd5e88f.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: 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