diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-08-27 00:47:57 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-08-27 00:47:57 +0200 |
| commit | e0a177d6765b314ce5fef4719e77cc6cc60b26bc (patch) | |
| tree | b4b9fb2174c6b6f2a5bafa6684f872ff8860ccd1 /ext/zip/php_zip.c | |
| parent | dbe8c37476ad31b20b19c01220869d68a0a07a63 (diff) | |
| parent | 1e1b7c74fb8b68aacb3948c2c499917397f82d29 (diff) | |
| download | php-git-e0a177d6765b314ce5fef4719e77cc6cc60b26bc.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update the GIT-RULES with the 5.6 and the release branches
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions