diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-11-08 16:36:31 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-11-08 16:36:31 +0400 |
| commit | 0e5c5072e698438ee9857979cf8418805865518a (patch) | |
| tree | 7bef2b50d8e0a6482e435a707c7f087f665dca84 /ext/json/php_json.h | |
| parent | 4e6a0bd5a996fc36282eb4666488a9ef1d0d7d5a (diff) | |
| parent | 915c428ba1006a144c4fca45e44631ec058a5074 (diff) | |
| download | php-git-0e5c5072e698438ee9857979cf8418805865518a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).
Conflicts:
NEWS
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions