Merge branch 'master' into admin-login

# Conflicts:
#	data/web/js/site/mailbox.js
This commit is contained in:
Marcel Hofer committed 2019-03-23 21:17:02 +01:00
commit 7d2289c3a7
12 files changed
+63 -31

No files matched your search

+1
View File
@@ -195,6 +195,7 @@ services:
- MAILDIR_GC_TIME=${MAILDIR_GC_TIME:-1440}
- ACL_ANYONE=${ACL_ANYONE:-disallow}
- SKIP_SOLR=${SKIP_SOLR:-y}
- MAILDIR_SUB=${MAILDIR_SUB:-}
ports:
- "${DOVEADM_PORT:-127.0.0.1:19991}:12345"
- "${IMAP_PORT:-143}:143"