diff options
| author | Remi Collet <remi@php.net> | 2015-04-18 09:41:49 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2015-04-18 09:41:49 +0200 |
| commit | 982cfd3db9d0183b0be51fee5197d935b777f73f (patch) | |
| tree | e81498c03e6742d39b6b3ebc354f72a2f08ce635 /Zend/zend_objects_API.c | |
| parent | 81d01809a28d7ac1c8ff941bb62975886302bd62 (diff) | |
| parent | 3bbfb96e1a1eef0a6cf6891532f9ac419c95dbd8 (diff) | |
| download | php-git-982cfd3db9d0183b0be51fee5197d935b777f73f.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
ignore second value for huge timestamp test (new zic)
Conflicts:
ext/date/tests/getdate_variation7.phpt
Diffstat (limited to 'Zend/zend_objects_API.c')
0 files changed, 0 insertions, 0 deletions