projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 654adc1 4a958e0)
Merge commit 'origin/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Mon, 20 Oct 2008 12:33:19 +0000 (14:33 +0200)
committerintrigeri <intrigeri@boum.org>
Mon, 20 Oct 2008 12:33:19 +0000 (14:33 +0200)
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.