projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5db8b5c a628f7c)
Merge branch 'master' into htmlify
authorDavid Bremner <bremner@unb.ca>
Mon, 1 Sep 2008 15:12:51 +0000 (12:12 -0300)
committerDavid Bremner <bremner@unb.ca>
Mon, 1 Sep 2008 15:12:51 +0000 (12:12 -0300)
1  2 
IkiWiki/Plugin/mailbox.pm patch | diff1 | diff2 | blob | history

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