projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 899639f b8f4ffd)
Merge remote branch 'smcv/ready/link-types'
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Apr 2010 02:50:19 +0000 (22:50 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Apr 2010 02:50:19 +0000 (22:50 -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.