]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e7c99a e5beb4e)
Merge branch 'PHP-7.0' into PHP-7.1
authorDmitry Stogov <dmitry@zend.com>
Wed, 19 Jul 2017 12:36:24 +0000 (15:36 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 19 Jul 2017 12:36:24 +0000 (15:36 +0300)
* PHP-7.0:
  Reset globals on startup or restart

1  2 
main/main.c patch | diff1 | diff2 | blob | history

diff --cc main/main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.