Merge branch 'master' into admin-login

# Conflicts: # data/web/js/site/mailbox.js
2019-03-23 21:17:02 +01:00
parent 3d8a46357b 6a13609bf0
commit 7d2289c3a7
12 changed files with 63 additions and 31 deletions
--- a/generate_config.sh
+++ b/generate_config.sh
@@ -238,6 +238,9 @@ IPV6_NETWORK=fd4d:6169:6c63:6f77::/64
 #API_KEY=
 #API_ALLOW_FROM=127.0.0.1,1.2.3.4

+# mail_home is ~/Maildir
+MAILDIR_SUB=Maildir
+
 EOF

 mkdir -p data/assets/ssl