diff options
| author | Anatol Belski <ab@php.net> | 2016-11-21 22:59:30 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-11-21 22:59:30 +0100 |
| commit | 2f5e49bdeb145e7f866229d593ceeef80b6669fc (patch) | |
| tree | 9fc6075923e852a68bd8ac688c4ac3c4730a3848 /ext/json/json.c | |
| parent | 285be2f92d80273c0eae2fe1fd24e462c80e4c2a (diff) | |
| parent | 914ff56cff2b10ba5bd29cae75248d2ed123bc04 (diff) | |
| download | php-git-2f5e49bdeb145e7f866229d593ceeef80b6669fc.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update php.ini-* for bug #69090
update php.ini-* according to changes for bug #69090
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions