projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5b0350 e4c6f5b)
Merge remote branch 'blipvert/fixes'
authorJoey Hess <joey@kitenet.net>
Sun, 28 Nov 2010 17:35:52 +0000 (13:35 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 28 Nov 2010 17:35:52 +0000 (13:35 -0400)
1  2 
IkiWiki.pm patch | diff1 | diff2 | blob | history

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