diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-01-21 13:32:08 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-01-21 13:32:08 +0800 |
| commit | 62f3e5adf88ded51a0112977ff2a269bea58d44d (patch) | |
| tree | 2495016ed4891e9d3eabb9b1cf2621a1740e25f9 /ext/json/json.c | |
| parent | 62c1c11ad34103729988df9edea343337a900ba9 (diff) | |
| parent | 50c255d16c58b4957077fd243c2768090c53e6ca (diff) | |
| download | php-git-62f3e5adf88ded51a0112977ff2a269bea58d44d.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
re-arrange NEWS
5.6.19 will be next
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
fix ReflectionClass::__toString doc block omitted
fix ReflectionClass::__toString doc block omitted
improve fix for bug #71201
improve fix for bug #71201
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions