]> granicus.if.org Git - php/commit
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)
commit8a11f3b166938acbbd91d5a9c0b41430a661a156
tree092e45e741936ff8f9068e56f781e0b2234fdb68
parentcf599e56adf99b6efdd7fe2a4877bb786a11df72
parentc12d474653c6d10cd74391943bdb7af4509ed2d3
Merge branch 'PHP-7.4'

* PHP-7.4:
  Prevent parallel test conflicts