diff options
| author | Anatol Belski <ab@php.net> | 2016-01-29 21:46:15 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-01-29 21:46:15 +0100 |
| commit | 620f4169a7a281b3c6c7d97cd455395d8374bb52 (patch) | |
| tree | f570315e65cd4a3599b12e7f916a68cf3a749ced /ext/zip/php_zip.h | |
| parent | 58b2344759121a332a135415d05df9335a00532f (diff) | |
| parent | b947aff98d5e905fb7942abe7bb99f66975601e0 (diff) | |
| download | php-git-620f4169a7a281b3c6c7d97cd455395d8374bb52.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
yet one revert
Revert "adjust test for 7.0"
Conflicts:
ext/session/tests/bug69111.phpt
Diffstat (limited to 'ext/zip/php_zip.h')
0 files changed, 0 insertions, 0 deletions