]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Thu, 23 May 2019 09:41:18 +0000 (11:41 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Thu, 23 May 2019 09:41:18 +0000 (11:41 +0200)
* PHP-7.4:
  Prevent potential test conflict


Trivial merge