diff options
author | Dmitry Stogov <dmitry@zend.com> | 2013-02-18 16:36:25 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2013-02-18 16:36:25 +0400 |
commit | d7cbc011880b9dee427d02c56423c04a3ecb09c9 (patch) | |
tree | 0ae3b76dcba651480928d4a70aa708cc4b4f454e /ext/zip/php_zip.c | |
parent | 427de31aa690156be9abed1139b8ba8f186c4dd8 (diff) | |
parent | d77eb411ea5d80379ee92a908f543b91fa293383 (diff) | |
download | php-git-d7cbc011880b9dee427d02c56423c04a3ecb09c9.tar.gz |
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #64070 (Inheritance with Traits failed with error)
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions