]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Sat, 15 Apr 2017 16:29:37 +0000 (18:29 +0200)
committerAnatol Belski <ab@php.net>
Sat, 15 Apr 2017 16:29:37 +0000 (18:29 +0200)
* PHP-7.1:
  fix error handling

1  2 
TSRM/tsrm_win32.c

Simple merge