]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sat, 15 Apr 2017 17:35:13 +0000 (19:35 +0200)
committerAnatol Belski <ab@php.net>
Sat, 15 Apr 2017 17:35:13 +0000 (19:35 +0200)
* PHP-7.0:
  improve/fix error handling

1  2 
ext/opcache/shared_alloc_win32.c

Simple merge