projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1e221f f33c2af)
Merge remote branch 'smcv/ready/sslcookie-auto'
authorJoey Hess <joey@kitenet.net>
Mon, 29 Nov 2010 20:31:25 +0000 (16:31 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 29 Nov 2010 20:31:25 +0000 (16:31 -0400)
1  2 
IkiWiki/CGI.pm patch | diff1 | diff2 | blob | history

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