Merge branch 'master' into devel

2013-06-19 20:38:38 +02:00 · 2013-06-19 20:38:38 +02:00 · f9beb28b1d
parent e90c1d9b28 c24a66c361
commit f9beb28b1d
1 changed files with 1 additions and 0 deletions
--- a/octoprint/static/js/ui.js
+++ b/octoprint/static/js/ui.js
@ -1118,6 +1118,7 @@ function UsersViewModel(loginStateViewModel) {
        {},
        "name",
        [],
+        [],
        CONFIG_USERSPERPAGE
    );