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

Conflicts:
	Netdisco/share/config.yml

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

..

admintask

table_pagesize option to set default size of table pages

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

device

Merge branch 'master' into og-autoload

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

report

table_pagesize option to set default size of table pages

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

search

table_pagesize option to set default size of table pages

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

statistics.tt

Move system information to the Netdisco "home" page

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