]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 3 Aug 2017 13:07:47 +0000 (15:07 +0200)
committerAnatol Belski <ab@php.net>
Thu, 3 Aug 2017 13:07:47 +0000 (15:07 +0200)
* PHP-7.0:
  Increase expected timing on Travis


Trivial merge