diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-05-09 19:00:40 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-05-09 19:00:40 -0700 |
| commit | 8c8889e7d470e0e20d2cab641c9833b4b3b8c6ac (patch) | |
| tree | ec6c0bcba60165be85ed0de76dd9f77dffb1d75f /ext/json | |
| parent | 1ceacc813aecb07fbda18f8c63c7a76792886d3d (diff) | |
| parent | 33594b78ec533127282a542d1e78b62df9e2dd4f (diff) | |
| download | php-git-8c8889e7d470e0e20d2cab641c9833b4b3b8c6ac.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #48147 - implement manual handling of //IGNORE for broken libc
Conflicts:
ext/iconv/iconv.c
Diffstat (limited to 'ext/json')
0 files changed, 0 insertions, 0 deletions