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

..

device

put colvis controls in sidebar [experimental]

2014-08-18 22:14:27 +01:00

report

Add Nodes discovered through LLDP/CDP report

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

search

Revert "Search device by CDP/LLDP advertised ID or Type"

2014-08-25 14:54:15 +01:00