starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-23 17:28:49 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Merge v2.5.11

Browse Source
This commit is contained in:
Jeremy Stretch
2019-04-29 14:40:18 -04:00
parent 2c730b08e4 d5dcb77d99
commit 37c2c4b4a2
13 changed files with 103 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/templates/ipam/vlan.html
View File

@@ -65,7 +65,7 @@
{% block content %}
<div class="row">
<div class="col-md-6">
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
<strong>VLAN</strong>
@@ -142,7 +142,7 @@
{% include 'inc/custom_fields_panel.html' with obj=vlan %}
{% include 'extras/inc/tags_panel.html' with tags=vlan.tags.all url='ipam:vlan_list' %}
</div>
<div class="col-md-6">
<div class="col-md-8">
<div class="panel panel-default">
<div class="panel-heading">
<strong>Prefixes</strong>