]> granicus.if.org Git - php/commit
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)
commitfa828dbe841c654dd7ac87c26929b873168eaea2
treeca030b49f0c3861c4e3a84d3c7b9f20e1b0d7707
parent89b3c9f647abccf41acdca8638882cfb19983318
parentd316ba2d659c73f0fea1f895ef554891c3dd130b
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Remove `user=foo` from FPM test config
  Skip FPM tests when running as root (unless requested)