projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82f0fac dd40fbd)
Merge branch 'master' into autoconfig
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 27 Jul 2008 01:16:16 +0000 (21:16 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 27 Jul 2008 01:16:16 +0000 (21:16 -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.