]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 6 Aug 2020 10:35:37 +0000 (12:35 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 6 Aug 2020 10:35:37 +0000 (12:35 +0200)
* PHP-7.4:
  Fix file clash in zlib test

1  2 
ext/zlib/tests/gzseek_variation4.phpt

Simple merge