]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorXinchen Hui <laruence@gmail.com>
Sat, 27 May 2017 04:12:17 +0000 (12:12 +0800)
committerXinchen Hui <laruence@gmail.com>
Sat, 27 May 2017 04:12:17 +0000 (12:12 +0800)
* PHP-7.1:
  Correct the location

1  2 
Zend/zend_API.c

diff --cc Zend/zend_API.c
Simple merge