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
+4
View File
@@ -41,6 +41,10 @@ namespace inbox {
special_use = \Trash
auto = subscribe
}
mailbox Archive {
special_use = \Archive
auto = subscribe
}
# dovevot's standard mailboxes configuration file marks two sent folders
# with the \Sent attribute, just in case clients don't agree about which