diff options
| author | Remi Collet <remi@php.net> | 2016-01-20 13:11:13 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2016-01-20 13:11:13 +0100 |
| commit | 544f8a07945235738ce3b39e3462ba88d3bb43d0 (patch) | |
| tree | df144e9769f877d6eed2359d6e4d463066b0b92f /ext/json/json.c | |
| parent | 7d100866ec2aa941555b4616dedae69d935c601b (diff) | |
| parent | e58cf4f9966b21f06d79044f6be69cfd5fd55a23 (diff) | |
| download | php-git-544f8a07945235738ce3b39e3462ba88d3bb43d0.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
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
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions