]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Wed, 11 Jan 2017 11:18:26 +0000 (11:18 +0000)
committerJoe Watkins <krakjoe@php.net>
Wed, 11 Jan 2017 11:18:26 +0000 (11:18 +0000)
* PHP-7.0:
  added a note to opache.fast_shutdown why its not enabled by default in php.ini

1  2 
php.ini-development
php.ini-production

Simple merge
Simple merge