diff options
| author | Julien Pauli <jpauli@php.net> | 2015-02-04 12:48:57 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-02-04 12:48:57 +0100 |
| commit | 93315c4e1d514c2824bbadc23337603314db8f63 (patch) | |
| tree | c46d4a39c9c6583113c19cbfc6af5f5ca3750d8b /ext/mysql/php_mysql.h | |
| parent | 4c3b4dc74af13eec25ad460551df8fd4b3984269 (diff) | |
| parent | c85f12e3aca8d1da64504018e421a766ab66e574 (diff) | |
| download | php-git-93315c4e1d514c2824bbadc23337603314db8f63.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Revert "json_decode() should generate a syntax error when given ""."
Update NEWS
Diffstat (limited to 'ext/mysql/php_mysql.h')
0 files changed, 0 insertions, 0 deletions