From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Mon, 24 Oct 2016 08:34:12 +0000 (+0100)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=511f9cb01b77c15811cfa1c32d25432d9b89c311;hp=49e29b5077980c4604517e6df189a2f9013010dc;p=max%2Fdotfiles.git

Merge branch 'master' of git.friedersdorff.com:max/dotfiles
---

diff --git a/offline_mail/.mbsync/personal.mbsync b/offline_mail/.mbsync/personal.mbsync
index e5669f8..a6d7e20 100644
--- a/offline_mail/.mbsync/personal.mbsync
+++ b/offline_mail/.mbsync/personal.mbsync
@@ -15,6 +15,6 @@ Inbox ~/mail/personal/Inbox
 Channel personal
 Master :personal-remote:
 Slave :personal-local:
-Patterns "INBOX" "Drafts" "Sent" "Spam" "Trash" "slackware" "todo" "quicknote"
+Patterns "INBOX" "Drafts" "Sent" "Spam" "Trash" "slackware" "quicknote" "todo"
 Create Both
 SyncState *
diff --git a/vim/.vimrc b/vim/.vimrc
index d01c9d8..999ce8a 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -31,6 +31,7 @@ Plugin 'vim-scripts/octave.vim--'
 Plugin 'vim-scripts/MatlabFilesEdition'
 Plugin 'flazz/vim-colorschemes'
 Plugin 'benmills/vimux'
+Plugin 'tmhedberg/SimpylFold'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required