diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-11-08 14:15:41 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-11-08 14:15:41 +0400 |
| commit | 4e6a0bd5a996fc36282eb4666488a9ef1d0d7d5a (patch) | |
| tree | b144b7241139feba5d4f7a9e9511916751677859 /ext/json/php_json.h | |
| parent | 756dc19e59c76acca5118e2ea37ff119b02f3b13 (diff) | |
| parent | 49fbe2579e9cbb4314346c8eaf959c670de0abdb (diff) | |
| download | php-git-4e6a0bd5a996fc36282eb4666488a9ef1d0d7d5a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Added tests for PHAR/OPCahce incompatibilities
Update NEWS
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
Update NEWS
Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
NEWS entry
NEWS entry
Conflicts:
NEWS
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions