]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 00:36:57 +0000 (00:36 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 00:36:57 +0000 (00:36 +0000)
commit3b8dc330bfcb9449b61efa289730bf1efd3f26ab
tree7ba9647c9720f766dff162fc6462c1146ebd168a
parentd4547304074096a9163488e7504c5ae5728605a2
parent47007455dc777aee13c5de9c6751c85c957a5172
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix FTP tests for Travis CI.