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


Trivial merge