]> granicus.if.org Git - php/commitdiff
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)
* PHP-7.4:
  Fix potential file collision in dom tests


Trivial merge