summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyson Andre <tysonandre775@hotmail.com>2021-02-06 14:17:50 -0500
committerTyson Andre <tysonandre775@hotmail.com>2021-02-06 14:17:50 -0500
commitf28970126ea592bcecd83e71cdad41b7f7669332 (patch)
treead84d3c6a4e90e53d98a54449bea8e8ef439835e
parentb4c6d5f7994746b9dcddc291c0bf7d91aa6e54cd (diff)
parent5e06dad411d895c6605115bd4ef4c86f3b2a0041 (diff)
downloadphp-git-f28970126ea592bcecd83e71cdad41b7f7669332.tar.gz
Merge remote-tracking branch 'php.net/PHP-8.0'
Conflicts: ext/zend_test/test.c ext/zend_test/test.stub.php ext/zend_test/test_arginfo.h
0 files changed, 0 insertions, 0 deletions