Merge branch 'master' into og-autoload

Conflicts: Netdisco/share/config.yml
2014-07-01 21:50:01 +01:00
parent 13957e82dc 58e5d05ac0
commit 95b6cb61b3
60 changed files with 124 additions and 70 deletions
--- a/Netdisco/share/config.yml
+++ b/Netdisco/share/config.yml
@@ -79,6 +79,7 @@ extra_web_plugins: []
 jobqueue_refresh: 10
 safe_password_store: true
 reports: []
+table_pagesize: 10

 # -------------
 # NETDISCO CORE