]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Fri, 22 Dec 2017 15:28:10 +0000 (16:28 +0100)
committerAnatol Belski <ab@php.net>
Fri, 22 Dec 2017 15:28:10 +0000 (16:28 +0100)
* PHP-7.1:
  pdo_odbc has no driver API for quoting, skip the test


Trivial merge