]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 10 Dec 2019 08:04:01 +0000 (09:04 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 10 Dec 2019 08:04:01 +0000 (09:04 +0100)
* PHP-7.4:
  Fix merge mistake

1  2 
ext/opcache/Optimizer/zend_ssa.h

Simple merge