]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8bb64c 2a1ad88)
Merge branch 'PHP-7.0' into PHP-7.1
authorJulien Pauli <jpauli@php.net>
Thu, 29 Jun 2017 18:24:03 +0000 (20:24 +0200)
committerJulien Pauli <jpauli@php.net>
Thu, 29 Jun 2017 18:24:03 +0000 (20:24 +0200)
* PHP-7.0:
  Updated NEWS
  Fix bug #74832, crash in extension loading

1  2 
Zend/zend_API.c patch | diff1 | diff2 | blob | history

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