]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 27 Jul 2017 22:27:52 +0000 (00:27 +0200)
committerAnatol Belski <ab@php.net>
Thu, 27 Jul 2017 22:27:52 +0000 (00:27 +0200)
* PHP-7.0:
  relax test on travis


Trivial merge