Merge branch 'master' into 4.0

This commit is contained in:
root 2019-01-13 00:50:13 +02:00
commit b7a33a10bf
2 changed files with 2 additions and 2 deletions

View File

@ -12,7 +12,7 @@
; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p argument)
; - /usr otherwise
include = /etc/php7/fpm.d/*.conf
include = /etc/php7/php-fpm.d/*.conf
;;;;;;;;;;;;;;;;;;
; Global Options ;

View File

@ -12,7 +12,7 @@
; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p argument)
; - /usr otherwise
include = /etc/php7/fpm.d/*.conf
include = /etc/php7/php-fpm.d/*.conf
;;;;;;;;;;;;;;;;;;
; Global Options ;