projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23a3de5 66053f6)
Merge commit 'origin/master' into aggregateinternal
authorSimon McVittie <smcv@carbon.pseudorandom.co.uk>
Mon, 14 Jul 2008 22:34:07 +0000 (23:34 +0100)
committerSimon McVittie <smcv@carbon.pseudorandom.co.uk>
Mon, 14 Jul 2008 22:34:07 +0000 (23:34 +0100)
1  2 
IkiWiki/Plugin/aggregate.pm patch | diff1 | diff2 | blob | history

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