]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 14 Apr 2017 23:40:59 +0000 (01:40 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 14 Apr 2017 23:40:59 +0000 (01:40 +0200)
1  2 
Zend/zend_compile.c
ext/opcache/Optimizer/dfa_pass.c

Simple merge
Simple merge