Oliver Gorwits 97d1232860 Merge branch 'master' into em-device-ports-json ...

Conflicts:
	Netdisco/share/public/css/netdisco.css
	Netdisco/share/views/ajax/device/ports.tt

2014-09-16 19:29:41 +01:00

..

AdminTask

node monitor admin panel

2014-07-22 20:26:15 +01:00

Device

node sorting by active, mac, ip

2014-08-18 19:46:25 +01:00

Report

Add Nodes discovered through LLDP/CDP report

2014-08-25 16:45:38 +01:00

Search

Port search also searches on the Remote ID and Type

2014-08-25 15:17:01 +01:00

Inventory.pm

release 2.012000

2013-08-06 18:35:15 +01:00