diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-04-28 13:29:05 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-04-28 13:29:05 +0300 |
| commit | a0d8cedd2b3f9ac1a3fa9f9c52c64107630d7e66 (patch) | |
| tree | a41b133dd7fd7edfa401c52c076dbd4c5d27f69d /ext/json/json_encoder.c | |
| parent | f8c1ce18e9b652befbc0527c067865253e96a77d (diff) | |
| parent | df4d0a73d241f24f5afe81584361b53ea9bc2a99 (diff) | |
| download | php-git-a0d8cedd2b3f9ac1a3fa9f9c52c64107630d7e66.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Revert "Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp)."
Diffstat (limited to 'ext/json/json_encoder.c')
0 files changed, 0 insertions, 0 deletions