diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:13:53 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:13:53 -0700 |
| commit | 568a35f84f934d1fe1b9817b4226cf2bd9d8f4cc (patch) | |
| tree | a15b8ce9f1699372ff38b70b3b7198713dfe5634 /ext/phar | |
| parent | ed709d5aa01375beb7e0b408c4027bbb9cfb52b6 (diff) | |
| parent | f2f8ea9ac53973a1ddb55ddc5eae3109d841309c (diff) | |
| download | php-git-568a35f84f934d1fe1b9817b4226cf2bd9d8f4cc.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
__wakeup doesn't have to be final
Diffstat (limited to 'ext/phar')
0 files changed, 0 insertions, 0 deletions