Merge remote-tracking branch 'upstream/release_16.01' into release_16.04

This commit is contained in:
Dannon Baker
2016-04-21 15:38:48 -04:00
2 changed files with 2 additions and 2 deletions
@@ -300,7 +300,7 @@
<td id="libraryItemInfo">${render_library_item_info( ldda )}</td>
<td>${ldda.extension | h}</td>
% endif
<td>${ldda.create_time.strftime( trans.app.config.pretty_datetime_format ) | h}</td>
<td>${util.unicodify(ldda.create_time.strftime( trans.app.config.pretty_datetime_format )) | h}</td>
<td>${ldda.get_size( nice_size=True ) | h}</td>
</tr>
<%
@@ -101,7 +101,7 @@
</div>
<div class="form-row">
<label>Date uploaded:</label>
${ldda.create_time.strftime( trans.app.config.pretty_datetime_format ) | h}
${util.unicodify(ldda.create_time.strftime( trans.app.config.pretty_datetime_format )) | h}
<div style="clear: both"></div>
</div>
<div class="form-row">