]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 00:37:24 +0000 (00:37 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 00:37:24 +0000 (00:37 +0000)
* PHP-7.1:
  Fix FTP tests for Travis CI.


Trivial merge