]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Tue, 4 Jul 2017 14:38:12 +0000 (16:38 +0200)
committerAnatol Belski <ab@php.net>
Tue, 4 Jul 2017 14:38:12 +0000 (16:38 +0200)
commit41ba98f02d6ce4c7572ef2b7856defead7d232ac
treeb57300e732f3626971268f29fc003905266cd46a
parent396c0f7a76c46159b30da4f4d3c422527a5c7b8b
parenta29264eb8c933f8569e62f1d6d6eba524e76ef70
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix datatype
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re