diff options
author | Sara Golemon <pollita@php.net> | 2015-02-15 09:05:38 +0100 |
---|---|---|
committer | Matteo Beccati <mbeccati@php.net> | 2015-06-08 08:33:32 +0200 |
commit | cf8898fbd53ccab619f225c4a8e031d5f3c0a785 (patch) | |
tree | fea64840ea4c8f0813a090823a5ef55df2dfd0e8 /UPGRADING | |
parent | 9c8696e645ff15387dd3af53d33f5deb9ac927b5 (diff) | |
download | php-git-cf8898fbd53ccab619f225c4a8e031d5f3c0a785.tar.gz |
Merge remote-tracking branch 'pollita/reflection.typehint'
Conflicts:
ext/reflection/php_reflection.c
ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt
Diffstat (limited to 'UPGRADING')
0 files changed, 0 insertions, 0 deletions