projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3f7c6a 18bb93f)
Merge remote branch 'smcv/ready/localurl'
authorJoey Hess <joey@kitenet.net>
Mon, 29 Nov 2010 18:43:57 +0000 (14:43 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 29 Nov 2010 18:43:57 +0000 (14:43 -0400)
1  2 
IkiWiki.pm patch | diff1 | diff2 | blob | history
IkiWiki/Plugin/rename.pm patch | diff1 | diff2 | blob | history

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