diff options
author | Xinchen Hui <laruence@gmail.com> | 2016-10-29 14:23:47 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@gmail.com> | 2016-10-29 14:23:47 +0800 |
commit | 6b671ca3ed28cf46a30e7fbfdfd688cda5878fff (patch) | |
tree | abe734b6e00b8c6a5b9246e426af5fcbbd8dbb49 /ext/json/php_json_encoder.h | |
parent | 8e4ea7a188f1b7d4b4b0726296ff1f7506db43a1 (diff) | |
parent | 66caa61188a7596f8af8da5d9f1217e5648f4076 (diff) | |
download | php-git-6b671ca3ed28cf46a30e7fbfdfd688cda5878fff.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Skip if no jit is built
Diffstat (limited to 'ext/json/php_json_encoder.h')
0 files changed, 0 insertions, 0 deletions