]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Fri, 13 Jan 2017 14:48:33 +0000 (15:48 +0100)
committerAnatol Belski <ab@php.net>
Fri, 13 Jan 2017 14:48:33 +0000 (15:48 +0100)
* PHP-7.0:
  templatize the resource number


Trivial merge