netbox-community-netbox

mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00

History

Jeremy Stretch b71566f206 Merge branch 'develop' into api2

Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/urls.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py

2017-02-16 14:28:06 -05:00

consoleport.html

2017-01-23 14:07:26 -05:00

consoleserverport.html

2017-01-23 14:07:26 -05:00

device_header.html

…

device_import_header.html

…

device_table.html

2017-01-20 16:42:11 -05:00

devicebay.html

2017-01-23 14:07:26 -05:00

devicetype_component_table.html

…

interface.html

Corrected API URL names

2017-02-03 16:54:13 -05:00

ipaddress.html

…

poweroutlet.html

2017-01-23 14:07:26 -05:00

powerport.html

2017-01-23 14:07:26 -05:00

rack_elevation.html

Rack reservations (#900 )

2017-02-16 13:46:58 -05:00

service.html

2017-01-18 13:30:19 -05:00