← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/templates/revision.pt

  • Committer: Matt Nordhoff
  • Date: 2009-06-06 09:16:19 UTC
  • mfrom: (363 trunk)
  • mto: This revision was merged to the branch mainline in revision 366.
  • Revision ID: mnordhoff@mattnordhoff.com-20090606091619-yaxmgbyylzeems83
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templates/revision.pt
96
96
          </ul>
97
97
        </tal:we-are-comparing>
98
98
 
99
 
        <tal:revision-info replace="structure python:revisioninfo(url, branch, change, file_changes, specific_path)" />
 
99
        <tal:revision-info replace="structure python:revisioninfo(url, branch, change, file_changes, specific_path, merged_in)" />
100
100
        <tal:specific-path condition="not:specific_path">
101
101
          <p class="expand show_if_js" id="expand_all"><a href="#">
102
102
              <img tal:attributes="src python:branch.static_url('/static/images/treeCollapsed.png')"