Merge remote-tracking branch 'upstream/master' into z-push-update

This commit is contained in:
Michael Kroes
2015-10-31 03:08:54 -04:00
2 changed files with 5 additions and 1 deletions
+1 -1
View File
@@ -56,7 +56,7 @@ tools/editconf.py /etc/dovecot/conf.d/10-mail.conf \
mail_privileged_group=mail \
first_valid_uid=0
# Create, subscribe, and mark as special folders: INBOX, Drafts, Sent, Trash, and Spam.
# Create, subscribe, and mark as special folders: INBOX, Drafts, Sent, Trash, Spam and Archive.
cp conf/dovecot-mailboxes.conf /etc/dovecot/conf.d/15-mailboxes.conf
# ### IMAP/POP