projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a1cb09 192ce7a)
Merge remote branch 'upstream/filter-full' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 11 Jul 2010 09:04:59 +0000 (11:04 +0200)
committerintrigeri <intrigeri@boum.org>
Sun, 11 Jul 2010 09:04:59 +0000 (11:04 +0200)
1  2 
IkiWiki/Plugin/comments.pm patch | diff1 | diff2 | blob | history

diff --cc IkiWiki/Plugin/comments.pm
Simple merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.