1
0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-07-15 14:05:20 +02:00

Merge branch 'master' into trunk

This commit is contained in:
root
2019-01-13 00:50:33 +02:00
2 changed files with 2 additions and 2 deletions
web-nginx-mysql/alpine/conf/etc/php7
web-nginx-pgsql/alpine/conf/etc/php7

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

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