From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Wed, 5 Oct 2016 09:20:16 +0000 (+0100)
Subject: Merge branch 'master' of github.com:maxf130/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=d4686f7d2de2f40700aa01e6591921ac28ac9d70;hp=-c;p=max%2Fdotfiles.git

Merge branch 'master' of github.com:maxf130/dotfiles
---

d4686f7d2de2f40700aa01e6591921ac28ac9d70
diff --combined offline_mail/.mbsync/personal.mbsync
index 9174fae,0615b5e..3617cd6
--- a/offline_mail/.mbsync/personal.mbsync
+++ b/offline_mail/.mbsync/personal.mbsync
@@@ -2,7 -2,7 +2,7 @@@ IMAPAccount persona
  Host mail.friedersdorff.com
  User max
  PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/personal.gpg"
- UseIMAPS yes
+ SSLType STARTTLS
  CertificateFile /etc/ssl/certs/ca-certificates.crt
  
  IMAPStore personal-remote
@@@ -15,6 -15,6 +15,6 @@@ Inbox ~/mail/personal/Inbo
  Channel personal
  Master :personal-remote:
  Slave :personal-local:
 -Patterns "INBOX" "Drafts" "Sent" "Spam" "Trash" "Sec-Announce" "Support-blfs" "Dev-blfs"
 +Patterns "INBOX" "Drafts" "Sent" "Spam" "Trash" "slackware"
  Create Both
  SyncState *