projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31bc223 66053f6)
Merge branch 'master' of git://git.ikiwiki.info
authorSimon McVittie <smcv@carbon.pseudorandom.co.uk>
Mon, 14 Jul 2008 21:22:39 +0000 (22:22 +0100)
committerSimon McVittie <smcv@carbon.pseudorandom.co.uk>
Mon, 14 Jul 2008 21:22:39 +0000 (22:22 +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.