summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-02-01 15:25:55 +0100
committerAnatol Belski <ab@php.net>2018-02-01 15:25:55 +0100
commit88aeb104a2284d77ab7f7bb872611fd73c8308e6 (patch)
tree038fe4184349d1f6c1b3c0ce103865f6e3e4637d
parent73eb5a78b9caa18d35624765f9b972c1ba48855d (diff)
parent2ae46f8eb65d2bd0f904a4f493dc1f244f1c972c (diff)
downloadphp-git-88aeb104a2284d77ab7f7bb872611fd73c8308e6.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: [ci skip] Update NEWS Fix race conditions with Apache vhost vs. per dir config
0 files changed, 0 insertions, 0 deletions