]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73eb5a7 2ae46f8)
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Thu, 1 Feb 2018 14:25:55 +0000 (15:25 +0100)
committerAnatol Belski <ab@php.net>
Thu, 1 Feb 2018 14:25:55 +0000 (15:25 +0100)
* PHP-7.1:
  [ci skip] Update NEWS
  Fix race conditions with Apache vhost vs. per dir config


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.