]> sipb.mit.edu Git - ikiwiki.git/commitdiff
sipb-www / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cac6df3 4da6e94)
Merge branch 'master' into sipb
authorQuentin Smith <quentin@mit.edu>
Sat, 13 Mar 2010 22:53:12 +0000 (17:53 -0500)
committerQuentin Smith <quentin@mit.edu>
Sat, 13 Mar 2010 22:53:12 +0000 (17:53 -0500)
Conflicts:
po/bg.po
po/cs.po
po/da.po
po/de.po
po/es.po
po/fr.po
po/gu.po
po/ikiwiki.pot
po/pl.po
po/sv.po
po/vi.po
templates/misc.tmpl
templates/page.tmpl

1  2 
IkiWiki/CGI.pm patch | diff1 | diff2 | blob | history
IkiWiki/Plugin/git.pm patch | diff1 | diff2 | blob | history
IkiWiki/Plugin/httpauth.pm patch | diff1 | diff2 | blob | history
IkiWiki/Plugin/mdwn.pm patch | diff1 | diff2 | blob | history
IkiWiki/Plugin/parentlinks.pm patch | diff1 | diff2 | blob | history
IkiWiki/Wrapper.pm patch | diff1 | diff2 | blob | history

diff --cc IkiWiki/CGI.pm
Simple merge
diff --cc IkiWiki/Plugin/git.pm
Simple merge
diff --cc IkiWiki/Plugin/httpauth.pm
Simple merge
diff --cc IkiWiki/Plugin/mdwn.pm
Simple merge
diff --cc IkiWiki/Plugin/parentlinks.pm
Simple merge
diff --cc IkiWiki/Wrapper.pm
Simple merge
wiki compiler