diff options
| author | Anatol Belski <ab@php.net> | 2015-02-06 09:42:41 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-02-06 09:42:41 +0100 |
| commit | 63761ab91e57c33faf8a1053b431dd16d030970c (patch) | |
| tree | 9f91c98a1fd11557c349173458e8b8edd3a9ef9b /ext/json/php_json_parser.h | |
| parent | af23980de7248aca587de2a3e5fcad1e044fb58c (diff) | |
| parent | 9ef0c39b2b9e1a8212a953aee9deee26f0978ce8 (diff) | |
| download | php-git-63761ab91e57c33faf8a1053b431dd16d030970c.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Removed erroneous condition
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions