]> git.g-eek.se Git - ikiwiki-pandoc.git/commitdiff
projects / ikiwiki-pandoc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d980e3f 635ec6a)
Merge branch 'master' of github.com:sciunto/ikiwiki-pandoc
authorFrançois Boulogne <fboulogne sciunto org>
Sun, 4 Aug 2013 21:33:43 +0000 (23:33 +0200)
committerFrançois Boulogne <fboulogne sciunto org>
Sun, 4 Aug 2013 21:33:43 +0000 (23:33 +0200)
1  2 
README.md patch | diff1 | diff2 | blob | history

diff --cc README.md
Simple merge