external/mailinabox
1
0 Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-11-14 09:16:00 +01:00
Code Issues Releases Wiki Activity

Merge branch 'jammyjellyfish2204' of https://github.com/mail-in-a-box/mailinabox into jammyjellyfish2204

Browse Source 
# Conflicts:
#	README.md
#	setup/mail-dovecot.sh
#	setup/system.sh
#	setup/webmail.sh
#	setup/zpush.sh
#	tests/test_mail.py
This commit is contained in:
downtownallday committed 2022-01-11 16:39:39 -05:00
2 parents d6cd4e826c 3998214e87
commit 4e6550ed22
31 files changed
+259 -194
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

conf/nginx-top.conf
+1 -1
View File
@@ -7,6 +7,6 @@
## your own --- please do not ask for help from us.
upstream php-fpm {
server unix:/var/run/php/php7.2-fpm.sock;
server unix:/var/run/php/php8.0-fpm.sock;
}