NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-07 04:27:27 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merged develop

Browse Source
This commit is contained in:
Jeremy Stretch
2016-08-22 15:49:41 -04:00
parent be4dde81e1 571e1fd8d6
commit c7e7063a2a
23 changed files with 53 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/templates/tenancy/tenant.html
View File

@@ -63,14 +63,6 @@
{% endif %}
</td>
</tr>
<tr>
<td>Created</td>
<td>{{ tenant.created }}</td>
</tr>
<tr>
<td>Last Updated</td>
<td>{{ tenant.last_updated }}</td>
</tr>
</table>
</div>
{% with tenant.custom_fields as custom_fields %}
@@ -88,6 +80,7 @@
{% endif %}
</div>
</div>
{% include 'inc/created_updated.html' with obj=tenant %}
</div>
<div class="col-md-5">
<div class="panel panel-default">