]> git.g-eek.se Git - ikiwiki-pandoc.git/commitdiff
projects / ikiwiki-pandoc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc3d427 86fff27)
Merge remote-tracking branch 'bk/master'
authorFrançois Boulogne <fboulogne sciunto org>
Sat, 4 May 2013 20:01:07 +0000 (22:01 +0200)
committerFrançois Boulogne <fboulogne sciunto org>
Sat, 4 May 2013 20:01:07 +0000 (22:01 +0200)
Conflicts:
pandoc.pm

1  2 
pandoc.pm patch | diff1 | diff2 | blob | history

diff --cc pandoc.pm
Simple merge