]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d454730 4700745)
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)
* PHP-7.0:
  Fix FTP tests for Travis CI.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.