diff options
| author | Anatol Belski <ab@php.net> | 2017-10-18 16:27:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-10-18 16:27:31 +0200 |
| commit | 5315cea6e276f96b8f44341df8527661dd6699ee (patch) | |
| tree | c6bbac7d6f92ef760427abcf3a22cc1df3332217 /ext/json/php_json_encoder.h | |
| parent | 63a0ddb0135c3c60a64e8d7dd81eb546d38a4dd9 (diff) | |
| parent | 53d8775015bbccc50e54c382851f64026c73a2d9 (diff) | |
| download | php-git-5315cea6e276f96b8f44341df8527661dd6699ee.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Backport 7ff13badda58b966ff8fbcc61add48bb5b14117b into 7.0+
Diffstat (limited to 'ext/json/php_json_encoder.h')
0 files changed, 0 insertions, 0 deletions