]> sipb.mit.edu Git - ikiwiki.git/commitdiff
sipb-www / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 669a5f5 d55d06e)
Merge branch 'ready/imgforpdf-and-more'
authorSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:59:00 +0000 (21:59 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:59:00 +0000 (21:59 +0100)

Trivial merge
wiki compiler