Oliver Gorwits 95b6cb61b3 Merge branch 'master' into og-autoload ...

Conflicts:
	Netdisco/share/config.yml

2014-07-01 21:50:01 +01:00

..

addresses_csv.tt

table_pagesize option to set default size of table pages

2014-06-30 12:38:43 +01:00

addresses.tt

table_pagesize option to set default size of table pages

2014-06-30 12:38:43 +01:00

details.tt

DataTables for device PoE status report

2014-06-19 19:00:37 -04:00

modules.tt

Provide links from device module tab to module inventory report

2014-02-16 23:41:26 -05:00

netmap.tt

add a waiting note to the netmap whilst the data loads

2014-02-22 09:06:30 +00:00

ports_csv.tt

[#66] Fix display of vlan membership

2014-01-11 09:44:35 +00:00

ports.tt

Merge branch 'master' into og-autoload

2014-07-01 21:50:01 +01:00