projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fc13ab 511f7f9)
Merge branch 'file_pruned_revamp'
authorJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 22:18:39 +0000 (18:18 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 22:18:39 +0000 (18:18 -0400)

Trivial merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.