]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Wed, 12 Jul 2017 12:49:58 +0000 (14:49 +0200)
committerAnatol Belski <ab@php.net>
Wed, 12 Jul 2017 12:49:58 +0000 (14:49 +0200)
* PHP-7.0:
  increase poll timeout as false positives mitigation


Trivial merge