]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Mon, 27 May 2019 16:43:18 +0000 (18:43 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Mon, 27 May 2019 16:43:18 +0000 (18:43 +0200)
* PHP-7.4:
  Prevent parallel test conflicts


Trivial merge