projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fadb26b c2684b9)
Merge commit 'origin/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 2 Nov 2008 12:11:00 +0000 (13:11 +0100)
committerintrigeri <intrigeri@boum.org>
Sun, 2 Nov 2008 12:11:00 +0000 (13:11 +0100)
1  2 
IkiWiki.pm patch | diff1 | diff2 | blob | history
doc/plugins/write.mdwn patch | diff1 | diff2 | blob | history

diff --cc IkiWiki.pm
Simple merge
diff --cc doc/plugins/write.mdwn
Simple merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.