mirror of
https://github.com/netbox-community/netbox.git
synced 2024-05-10 07:54:54 +00:00
7a3af8de83
# Conflicts: # netbox/dcim/tables/template_code.py # netbox/netbox/forms.py # netbox/templates/dcim/cable_connect.html # netbox/templates/dcim/consoleport.html # netbox/templates/dcim/consoleserverport.html # netbox/templates/dcim/device.html # netbox/templates/dcim/device/base.html # netbox/templates/dcim/device_edit.html # netbox/templates/dcim/interface.html # netbox/templates/dcim/rack.html # netbox/templates/dcim/rack_edit.html # netbox/templates/dcim/site.html # netbox/templates/extras/configcontext.html # netbox/templates/extras/objectchange.html # netbox/templates/generic/object.html # netbox/templates/inc/nav_menu.html # netbox/templates/ipam/ipaddress_edit.html # netbox/templates/ipam/vrf.html # netbox/utilities/templates/buttons/export.html