projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0055354 20ecef4)
Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 22 Aug 2010 09:05:03 +0000 (11:05 +0200)
committerintrigeri <intrigeri@boum.org>
Sun, 22 Aug 2010 09:05:03 +0000 (11:05 +0200)
1  2 
t/po.t patch | diff1 | diff2 | blob | history

diff --cc t/po.t
Simple merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.