]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorJakub Zelenka <bukka@php.net>
Sun, 10 Jun 2018 13:34:23 +0000 (14:34 +0100)
committerJakub Zelenka <bukka@php.net>
Sun, 10 Jun 2018 13:34:23 +0000 (14:34 +0100)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge