Merge branch 'develop-2.4' into 1898-activity-logging

This commit is contained in:
Jeremy Stretch
2018-06-21 16:53:15 -04:00
20 changed files with 294 additions and 26 deletions

View File

@@ -286,6 +286,11 @@
{% endif %}
<a href="{% url 'ipam:vlangroup_list' %}">VLAN Groups</a>
</li>
<li class="divider"></li>
<li class="dropdown-header">Services</li>
<li>
<a href="{% url 'ipam:service_list' %}">Services</a>
</li>
</ul>
</li>
<li class="dropdown{% if request.path|contains:'/virtualization/' %} active{% endif %}">