projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d98296d 11bd781)
Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sat, 24 Jul 2010 09:19:28 +0000 (11:19 +0200)
committerintrigeri <intrigeri@boum.org>
Sat, 24 Jul 2010 09:19:28 +0000 (11:19 +0200)
1  2 
IkiWiki/Plugin/po.pm patch | diff1 | diff2 | blob | history

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