]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4' into PHP-8.0
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 15 Dec 2020 09:15:47 +0000 (10:15 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 15 Dec 2020 09:15:47 +0000 (10:15 +0100)
* PHP-7.4:
  IBM i PASE doesn't support ITIMER_PROF

1  2 
Zend/zend_execute_API.c
Zend/zend_signal.c

Simple merge
Simple merge