Oliver Gorwits 7f2a9b7c3b Merge branch 'master' into em-device-ports-json ...

Conflicts:
	Netdisco/share/views/ajax/datatabledefaults.tt

2014-11-16 22:41:02 +00:00

..

admintask

get rid of device_ports and self_options template vars

2014-11-03 19:59:42 +00:00

device

Merge branch 'master' into em-device-ports-json

2014-11-16 21:59:35 +00:00

report

Merge branch 'master' into em-device-ports-json

2014-11-16 22:41:02 +00:00

search

get rid of device_ports and self_options template vars

2014-11-03 19:59:42 +00:00

datatabledefaults.tt

Merge branch 'master' into em-device-ports-json

2014-11-16 22:41:02 +00:00

statistics.tt

Move system information to the Netdisco "home" page

2014-02-22 17:43:22 +00:00