checktheroads
|
4c3b0abe7b
|
Merge branch 'feature' of https://github.com/netbox-community/netbox into feature
# Conflicts:
# netbox/dcim/tables/template_code.py
# netbox/netbox/views/__init__.py
# netbox/project-static/css/base.css
# netbox/templates/base.html
# netbox/templates/circuits/circuit.html
# netbox/templates/circuits/circuittermination_edit.html
# netbox/templates/circuits/inc/circuit_termination.html
# netbox/templates/circuits/provider.html
# netbox/templates/dcim/device.html
# netbox/templates/dcim/device/base.html
# netbox/templates/dcim/device_component.html
# netbox/templates/dcim/devicetype.html
# netbox/templates/dcim/inc/device_napalm_tabs.html
# netbox/templates/dcim/rack.html
# netbox/templates/dcim/site.html
# netbox/templates/dcim/virtualchassis.html
# netbox/templates/extras/configcontext.html
# netbox/templates/extras/object_journal.html
# netbox/templates/extras/tag.html
# netbox/templates/generic/object.html
# netbox/templates/generic/object_list.html
# netbox/templates/home.html
# netbox/templates/inc/nav_menu.html
# netbox/templates/ipam/aggregate.html
# netbox/templates/ipam/ipaddress.html
# netbox/templates/ipam/prefix.html
# netbox/templates/ipam/vlan.html
# netbox/templates/ipam/vlangroup_edit.html
# netbox/templates/ipam/vlangroup_vlans.html
# netbox/templates/secrets/secret.html
# netbox/templates/tenancy/tenant.html
# netbox/templates/users/api_tokens.html
# netbox/templates/virtualization/cluster.html
# netbox/templates/virtualization/vminterface_edit.html
# netbox/utilities/forms/fields.py
# netbox/utilities/templates/buttons/export.html
|
2021-04-14 11:30:15 -07:00 |
|
