projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b225fdc be60d26)
Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Tue, 29 Jun 2010 13:53:51 +0000 (15:53 +0200)
committerintrigeri <intrigeri@boum.org>
Tue, 29 Jun 2010 13:53:51 +0000 (15:53 +0200)
Conflicts:
doc/plugins/po.mdwn

1  2 
doc/plugins/po.mdwn patch | diff1 | diff2 | blob | history

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