]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 18 Aug 2016 12:40:20 +0000 (14:40 +0200)
committerAnatol Belski <ab@php.net>
Thu, 18 Aug 2016 12:40:20 +0000 (14:40 +0200)
* PHP-7.0:
  Fixed bug #72858 shm_attach null dereference

1  2 
TSRM/tsrm_win32.c

Simple merge