diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2014-01-27 18:57:45 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2014-01-27 18:57:45 +0900 |
| commit | a63c0950330997361a082bd35c9e62a70417ec66 (patch) | |
| tree | 25e112eb72d2bed71862331f14c5761e9134679e /ext/json/json.c | |
| parent | 223a62d69eeace864cb5deb45e3a56eb3ac3beaa (diff) | |
| parent | de99fd7301421f515e545bd20a4b226715e16a41 (diff) | |
| download | php-git-a63c0950330997361a082bd35c9e62a70417ec66.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Remove obsolete description
Conflicts:
php.ini-development
php.ini-production
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions