]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorChristoph M. Becker <cmbecker69@gmx.de>
Thu, 12 Jul 2018 11:46:10 +0000 (13:46 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Thu, 12 Jul 2018 11:46:10 +0000 (13:46 +0200)
* PHP-7.1:
  Fix Travis build

1  2 
.travis.yml

diff --cc .travis.yml
Simple merge