]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 21 Sep 2017 08:32:47 +0000 (10:32 +0200)
committerAnatol Belski <ab@php.net>
Thu, 21 Sep 2017 08:32:47 +0000 (10:32 +0200)
* PHP-7.0:
  Fix thread safety

1  2 
main/main.c

diff --cc main/main.c
Simple merge