projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eff5e23 bc32754)
Merge branch 'themes'
authorJoey Hess <joey@kitenet.net>
Wed, 16 Jun 2010 23:17:18 +0000 (19:17 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 16 Jun 2010 23:17:18 +0000 (19:17 -0400)

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