]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Sun, 16 Jun 2019 09:56:21 +0000 (11:56 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Sun, 16 Jun 2019 09:56:21 +0000 (11:56 +0200)
* PHP-7.4:
  Prevent parallel test conflict


Trivial merge