]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/history - templates/editconflict.tmpl
Merge commit 'remotes/github/pedigree' into slop
[git.ikiwiki.info.git] / templates / editconflict.tmpl
2009-08-27 Joey HessMerge commit 'remotes/github/pedigree' into slop
2009-08-27 Joey HessMerge commit 'remotes/github/debian-unstable' into...
2009-08-27 Joey HessMerge commit 'remotes/github/aggregate' into slop
2009-08-27 Joey HessMerge commit '01d7ae803710bb0d84fc8d172fd98fd57fb77e9d...
2008-07-23 Joey HessMerge branch 'master' into tova
2008-07-23 Joey HessMerge branch 'master' into tova
2008-07-22 Joey HessSplit out error messages from editpage.tmpl into severa...