diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-11-07 10:24:25 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-11-07 10:24:25 +0300 |
| commit | 2afb5df4da4b27c42444a2ac9523b57c26e31459 (patch) | |
| tree | d96d5ecb9a62c7c1c14b0a993692ebbadab5547b /ext/json/php_json.h | |
| parent | 6b4b972565e38c41f1ce43c3a475e41e186b0f0c (diff) | |
| parent | e6581d52cc12664c2c9d470a32848c9b0bae8217 (diff) | |
| download | php-git-2afb5df4da4b27c42444a2ac9523b57c26e31459.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix opcache.revalidate_freq per-request behavior
Conflicts:
ext/opcache/ZendAccelerator.h
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions