]> sipb.mit.edu Git - ikiwiki.git/commitdiff
sipb-www / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70a4857 26d62b3)
Merge branch 'ready/edittemplate2'
authorSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:54:13 +0000 (21:54 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:54:13 +0000 (21:54 +0100)

Trivial merge
wiki compiler