]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1' into PHP-7.2
authorChristoph M. Becker <cmbecker69@gmx.de>
Wed, 14 Nov 2018 13:56:41 +0000 (14:56 +0100)
committerChristoph M. Becker <cmbecker69@gmx.de>
Wed, 14 Nov 2018 13:57:40 +0000 (14:57 +0100)
commit211c6189f6921c17ec55a3b422ab5fa4bdd5e88f
treec4d694ec9f2f99c0a0b2139a5d6b369df2c90a7f
parentce4eb8997651e04fa9284ac3a7e1a2fb2da7df9e
parenta56cdd0a824d439920548aaeae757cb2341bd4ec
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR
NEWS
ext/iconv/iconv.c