]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'php.net/PHP-8.0'
authorTyson Andre <tysonandre775@hotmail.com>
Sat, 6 Feb 2021 19:17:50 +0000 (14:17 -0500)
committerTyson Andre <tysonandre775@hotmail.com>
Sat, 6 Feb 2021 19:17:50 +0000 (14:17 -0500)
Conflicts:
ext/zend_test/test.c
ext/zend_test/test.stub.php
ext/zend_test/test_arginfo.h


Trivial merge