]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Fri, 12 Jan 2018 11:21:43 +0000 (12:21 +0100)
committerAnatol Belski <ab@php.net>
Fri, 12 Jan 2018 11:21:43 +0000 (12:21 +0100)
* PHP-7.1:
  Unify EOL
  Extend test, latest cURL ships also with smb and smbs


Trivial merge