diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-03-10 19:30:32 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-03-10 19:30:32 +0300 |
| commit | b52a2940af7144486f0b2861bf737274aa00e87f (patch) | |
| tree | 148f0e12d95db199821fef8d6bc4bc0efe1dae80 /ext/json/php_json_parser.h | |
| parent | 25050e3b00b448056ac780510923e076e7dcd270 (diff) | |
| parent | c814b3294ad72baad8d9da52dbef81dcafded451 (diff) | |
| download | php-git-b52a2940af7144486f0b2861bf737274aa00e87f.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
We don't cache custom strems with callbacks anymore
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions