]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Wed, 3 Aug 2016 10:20:23 +0000 (12:20 +0200)
committerAnatol Belski <ab@php.net>
Wed, 3 Aug 2016 10:20:23 +0000 (12:20 +0200)
* PHP-7.0:
  fix ts build


Trivial merge