diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-11-08 16:37:28 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-11-08 16:37:28 +0400 |
| commit | 43cb6ba7639aacf08f5e6a46428b12f5df303f6f (patch) | |
| tree | 1c460f92dcdac22de8ec924d64bd8c529184b9d4 /ext/json/json.c | |
| parent | 8f097fb4660046c9da90aecdd0ccdc6ee1281026 (diff) | |
| parent | 915c428ba1006a144c4fca45e44631ec058a5074 (diff) | |
| download | php-git-43cb6ba7639aacf08f5e6a46428b12f5df303f6f.tar.gz | |
Merge branch 'PHP-5.5'
* 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/json.c')
0 files changed, 0 insertions, 0 deletions