]> granicus.if.org Git - php/commit
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)
commit2ae5f2d1a5a208cc748b509cf71fdceb0989520a
tree5916633f45c045f7b609d85b105079ebfba60e20
parente7c3f449581a9724b5dd3d051c0420987a669c01
parent3500262b7d0388cb9ad7c2418286cedc8145eb23
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  templatize the resource number