projects / ikiwiki.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4e1806e 04af2f9)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 8 Apr 2012 18:17:29 +0000 (14:17 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 8 Apr 2012 18:17:29 +0000 (14:17 -0400)
commit8cdbe23435d6a027d25c106c00ba34665fd54ed1
tree5cd5be5e92241916a943b9d7dc768b49a53185eetree | snapshot
parent4e1806ef7c002a4a333c5822c13d7ceca303bf70commit | diff
parent04af2f9f52bcaa2455eaaef95d4d7c0b747b7d06commit | diff
Merge branch 'master' of ssh://git.ikiwiki.info
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.