]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 8 Feb 2017 00:10:54 +0000 (01:10 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 8 Feb 2017 00:10:54 +0000 (01:10 +0100)
1  2 
sapi/apache2handler/php_apache.h
sapi/apache2handler/sapi_apache2.c

Simple merge
Simple merge