]> sipb.mit.edu Git - ikiwiki.git/commitdiff
sipb-www / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9b1a4d 1bb9157)
Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 11 Jul 2010 08:46:18 +0000 (10:46 +0200)
committerintrigeri <intrigeri@boum.org>
Sun, 11 Jul 2010 08:46:18 +0000 (10:46 +0200)
Conflicts:
IkiWiki/Plugin/po.pm
doc/plugins/po.mdwn

1  2 
IkiWiki.pm patch | diff1 | diff2 | blob | history
IkiWiki/Plugin/po.pm patch | diff1 | diff2 | blob | history
doc/plugins/po.mdwn patch | diff1 | diff2 | blob | history
doc/plugins/write.mdwn patch | diff1 | diff2 | blob | history

diff --cc IkiWiki.pm
Simple merge
diff --cc IkiWiki/Plugin/po.pm
Simple merge
diff --cc doc/plugins/po.mdwn
Simple merge
diff --cc doc/plugins/write.mdwn
Simple merge
wiki compiler