diff options
author | Anatol Belski <ab@php.net> | 2017-07-28 00:28:12 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2017-07-28 00:28:12 +0200 |
commit | 2ae0dd7f61c4bd35c7f9ea8245d1ea2949497534 (patch) | |
tree | 3a3477870d161fde4416386128701d3b188492ac /ext/phar/config.w32 | |
parent | 4a6ef8327a5b2e0bc51f833df200b7508030eede (diff) | |
parent | 55e7459cea101384c386821b4560a32d2f48aa8d (diff) | |
download | php-git-2ae0dd7f61c4bd35c7f9ea8245d1ea2949497534.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
relax test on travis
Diffstat (limited to 'ext/phar/config.w32')
0 files changed, 0 insertions, 0 deletions