]> git.g-eek.se Git - ikiwiki-pandoc.git/commitdiff
Merge branch 'master' of github.com:openmedi/ikiwiki-pandoc
authorMartin Hhnel <martinopenmedi@gmail.com>
Sat, 20 Jan 2018 20:36:22 +0000 (21:36 +0100)
committerMartin Hhnel <martinopenmedi@gmail.com>
Sat, 20 Jan 2018 20:36:22 +0000 (21:36 +0100)
1  2 
pandoc.pm

diff --cc pandoc.pm
Simple merge