diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -68,7 +68,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.r %if len(cs.parents)>1:
- ${_('merge')}merge + ${_('merge')}merge
%endif %if cs.parents: