diff options
| author | Sara Golemon <pollita@php.net> | 2017-05-23 16:29:11 -0700 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-05-23 16:29:11 -0700 |
| commit | 92056aee85aff6d6fafe785d063844bfd97ad7b2 (patch) | |
| tree | 62bf9256025bd2ec153ec990e4262384a38e1c7c /ext/json/json_encoder.c | |
| parent | dd4a78b631b356beb8c7b5ab7f58a91008143d5a (diff) | |
| parent | e535b80257b2ef3a515d0833a40e96788ba830e2 (diff) | |
| download | php-git-92056aee85aff6d6fafe785d063844bfd97ad7b2.tar.gz | |
Merge branch 'PHP-7.1'
7.1.x release shouldn't have been pn mainline PHP-7.1 branch
Fix the merge history to keep master in place.
* PHP-7.1:
bump versions
Diffstat (limited to 'ext/json/json_encoder.c')
0 files changed, 0 insertions, 0 deletions