]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorXinchen Hui <laruence@gmail.com>
Wed, 21 Dec 2016 06:27:13 +0000 (14:27 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 21 Dec 2016 06:27:13 +0000 (14:27 +0800)
* PHP-7.1:
  Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt)

1  2 
Zend/zend_compile.c

Simple merge