]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 189df8e 0da08fe)
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Tue, 22 Nov 2016 01:59:17 +0000 (02:59 +0100)
committerAnatol Belski <ab@php.net>
Tue, 22 Nov 2016 01:59:17 +0000 (02:59 +0100)
* PHP-7.0:
  Revert "fix invalid read, follow up on 97b65cc9"

1  2 
Zend/zend_ini_parser.y patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_ini_parser.y
Simple merge
Unnamed repository; edit this file 'description' to name the repository.