]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorFerenc Kovacs <tyra3l@gmail.com>
Wed, 25 Oct 2017 01:17:14 +0000 (03:17 +0200)
committerFerenc Kovacs <tyra3l@gmail.com>
Wed, 25 Oct 2017 01:17:14 +0000 (03:17 +0200)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge