EinfachToll f8ee21aa64 Merge branch 'refactor-internal-state-handling' into dev ... Conflicts: autoload/vimwiki/base.vim autoload/vimwiki/diary.vim autoload/vimwiki/html.vim autoload/vimwiki/lst.vim autoload/vimwiki/markdown_base.vim doc/vimwiki.txt ftplugin/vimwiki.vim plugin/vimwiki.vim syntax/vimwiki.vim syntax/vimwiki_default.vim syntax/vimwiki_markdown.vim syntax/vimwiki_media.vim		2018-02-19 17:56:17 +01:00
..
vimwiki	Merge branch 'refactor-internal-state-handling' into dev	2018-02-19 17:56:17 +01:00