Merge branch 'master' into multi

This commit is contained in:
Roberto Rosario
2011-03-18 10:22:41 -04:00
5 changed files with 32 additions and 15 deletions
@@ -68,9 +68,9 @@
{% endif %}
{% for column in extra_columns %}
{% if column.keep_together %}
<div class="nowrap" style="word-wrap: normal">
<td>{{ object|object_property:column.attribute|safe|make_non_breakable }}</td>
</div>
<td>
{{ object|object_property:column.attribute|safe|make_non_breakable }}
</td>
{% else %}
<td>{{ object|object_property:column.attribute|safe }}</td>
{% endif %}