projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74d563f acb79b5)
Merge commit 'remotes/smcv/ready/among'
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 31 Jul 2009 08:12:23 +0000 (10:12 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 31 Jul 2009 08:12:23 +0000 (10:12 +0200)
1  2 
IkiWiki/Render.pm patch | diff1 | diff2 | blob | history

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