summaryrefslogtreecommitdiff
path: root/ext/json/php_json_encoder.h
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-11-07 10:17:48 +0300
committerDmitry Stogov <dmitry@zend.com>2014-11-07 10:17:48 +0300
commite6581d52cc12664c2c9d470a32848c9b0bae8217 (patch)
tree8252b9677568aec4dc73a86e75c58e6b05ec6d6b /ext/json/php_json_encoder.h
parente120438c8c06b03308fa1f585623059a093a3604 (diff)
parent033abd6d7783a8c98e8fc3612aa100de72408363 (diff)
downloadphp-git-e6581d52cc12664c2c9d470a32848c9b0bae8217.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fix opcache.revalidate_freq per-request behavior
Diffstat (limited to 'ext/json/php_json_encoder.h')
0 files changed, 0 insertions, 0 deletions