projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1332327 2a99ebf)
Merge branch 'master' of git://github.com/joeyh/ikiwiki
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Wed, 9 Sep 2009 18:44:52 +0000 (14:44 -0400)
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Wed, 9 Sep 2009 18:44:52 +0000 (14:44 -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.