]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJulien Pauli <jpauli@php.net>
Thu, 29 Jun 2017 18:25:18 +0000 (20:25 +0200)
committerJulien Pauli <jpauli@php.net>
Thu, 29 Jun 2017 18:25:18 +0000 (20:25 +0200)
* PHP-7.1:
  Updated NEWS
  Updated NEWS
  Fix bug #74832, crash in extension loading

1  2 
Zend/zend_API.c

diff --cc Zend/zend_API.c
Simple merge