diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-03-01 22:55:49 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-03-01 22:55:49 -0800 |
| commit | 6e6a556b8c8e192ab44edeaabe012f29b614202d (patch) | |
| tree | 884ec4bc394bec72111cf63621b0840d90032f25 | |
| parent | a0bbac550e3a6e098ccc5d2ecc9ef7fbbfa0b207 (diff) | |
| parent | 3c8ccdd9d301a59e0ea33bc7d6b395156b324084 (diff) | |
| download | php-git-6e6a556b8c8e192ab44edeaabe012f29b614202d.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6.19
* PHP-5.5:
fix test file
Fix version
Update NEWS
| -rwxr-xr-x | ext/phar/tests/bug70433.zip | bin | 264 -> 269 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/ext/phar/tests/bug70433.zip b/ext/phar/tests/bug70433.zip Binary files differindex 3994a30a8e..232a2210f5 100755 --- a/ext/phar/tests/bug70433.zip +++ b/ext/phar/tests/bug70433.zip |