]> git.g-eek.se Git - ikiwiki-pandoc.git/commitdiff
projects / ikiwiki-pandoc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e755639 7ef0d3e)
Merge remote-tracking branch 'rburgoyne/master'
authorFrançois Boulogne <fboulogne sciunto org>
Sat, 4 May 2013 19:47:47 +0000 (21:47 +0200)
committerFrançois Boulogne <fboulogne sciunto org>
Sat, 4 May 2013 19:47:47 +0000 (21:47 +0200)
Conflicts:
.gitignore
pandoc.pm

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

diff --cc pandoc.pm
index ec3706dc603ad2887cdd672830d2ea2272782a6a,2427a5abc67efe49e49689279db70f3b47ea4c0e..2427a5abc67efe49e49689279db70f3b47ea4c0e
mode 100755,100644..100755
--- 1/pandoc.pm
--- 2/pandoc.pm
+++ b/pandoc.pm