]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Fri, 13 Jan 2017 06:45:17 +0000 (06:45 +0000)
committerJoe Watkins <krakjoe@php.net>
Fri, 13 Jan 2017 06:45:17 +0000 (06:45 +0000)
commit19363de12f663f20a6e0e9969c55710ca3c9fe4f
tree45e6bca44044fa8c612d5546fabaecc1a296db2e
parentb25be216c1dc2f27e54b59eb19582d4a951b4c7c
parentfd92b911888f482d8d5794e6abac41bdff9ad3a2
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Increase wait time for tests involving sockets to improve Travis relability