sipb-www / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a553610 3f4a935)
Merge branch 'ready/trail-sort'
authorSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:38:06 +0000 (21:38 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:38:06 +0000 (21:38 +0100)
1  2 
IkiWiki.pm patch | diff1 | diff2 | blob | history

diff --cc IkiWiki.pm
Simple merge
wiki compiler