]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorJoe Watkins <krakjoe@php.net>
Wed, 2 Aug 2017 07:35:51 +0000 (08:35 +0100)
committerJoe Watkins <krakjoe@php.net>
Wed, 2 Aug 2017 07:35:51 +0000 (08:35 +0100)
* PHP-7.1:
  fixed #endif comments

1  2 
Zend/zend.c

diff --cc Zend/zend.c
Simple merge