diff options
| author | Anatol Belski <ab@php.net> | 2016-01-29 19:59:26 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-01-29 19:59:26 +0100 |
| commit | 1a9402c6ec7cbb98c8774bebdd7f576d6b822a7d (patch) | |
| tree | 1b0ba715341f2199318fde4abc472f12e37e4923 /ext/zip/php_zip.h | |
| parent | c7c1679bb36df048a3e0c3a25c1d7a8e48c1e897 (diff) | |
| parent | 80f7b0125875116fdbcdaf48cf8b1bbf93cb378c (diff) | |
| download | php-git-1a9402c6ec7cbb98c8774bebdd7f576d6b822a7d.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
refix #69111 and one related test
Conflicts:
ext/session/tests/rfc1867_sid_invalid.phpt
Diffstat (limited to 'ext/zip/php_zip.h')
0 files changed, 0 insertions, 0 deletions