]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.4' into PHP-8.0
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 24 Feb 2021 20:30:44 +0000 (21:30 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 24 Feb 2021 20:30:44 +0000 (21:30 +0100)
commit44ef32ff2cc01d67fefb4e52c5bd29ed5ae3f858
treeff87f4d30100ac9236f5451bb0616f82d050f9ee
parentaaea81de7cd9e5c3c4fd5620cf6d1e5b6195ef32
parent766f827e26d76c17945ed1fd36f65eaa57419607
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix potential file collision in dom tests