EinfachToll b1393a34f7 Merge branch 'dev' into path-handling ... Conflicts: autoload/vimwiki/base.vim autoload/vimwiki/diary.vim autoload/vimwiki/html.vim autoload/vimwiki/path.vim autoload/vimwiki/tags.vim autoload/vimwiki/u.vim autoload/vimwiki/vars.vim ftplugin/vimwiki.vim plugin/vimwiki.vim		2018-04-25 21:46:00 +02:00
..
vimwiki.vim	Merge branch 'dev' into path-handling	2018-04-25 21:46:00 +02:00