diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-02-20 10:32:34 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-02-20 10:32:34 +0300 |
| commit | 90421b0d5b8b63b93a5e6435875e651415231082 (patch) | |
| tree | 6266c6f42c73b8e4737165d9efa1588b8139d536 /ext/json/json.c | |
| parent | 97dd859c9ca7c4a5345d9260183092a9fe437cb5 (diff) | |
| parent | 9fb48edf3c32914330b7a5081a34b4328bf6da68 (diff) | |
| download | php-git-90421b0d5b8b63b93a5e6435875e651415231082.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed type mismatch
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions