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

diff --cc .travis.yml
Simple merge