]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89b3c9f d316ba2)
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Wed, 24 May 2017 22:16:06 +0000 (01:16 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 24 May 2017 22:16:06 +0000 (01:16 +0300)
* 'master' of git.php.net:php-src:
  Remove `user=foo` from FPM test config
  Skip FPM tests when running as root (unless requested)


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