projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34e8c78 5c855b2)
Merge branch 'master' into autotag
authorJoey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 18:21:40 +0000 (14:21 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 18:21:40 +0000 (14:21 -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.