]> git.g-eek.se Git - ikiwiki-pandoc.git/commitdiff
projects / ikiwiki-pandoc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c689d76 067b258)
Merge branch 'master' of github.com:sciunto-org/ikiwiki-pandoc
authorFrançois Boulogne <fboulogne sciunto org>
Sun, 31 Jan 2016 20:30:21 +0000 (15:30 -0500)
committerFrançois Boulogne <fboulogne sciunto org>
Sun, 31 Jan 2016 20:30:21 +0000 (15:30 -0500)
1  2 
CHANGELOG patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG
Simple merge