diff options
| author | Udo Walter | 2017-11-21 17:52:04 +0100 |
|---|---|---|
| committer | Udo Walter | 2017-11-21 17:52:04 +0100 |
| commit | 653851f35d0eea172c2302e9f1b6f0d03c70096c (patch) | |
| tree | 42f267c360104b98d2e3199273adba62a1e2023b /inc/taskmanager.inc.php | |
| parent | [internetaccess] reworked permission system from "click and you get error" to... (diff) | |
| parent | [statistics] Also adapt MAC-UUID fixing code to mltk changes (diff) | |
| download | slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.tar.gz slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.tar.xz slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.zip | |
Merge remote-tracking branch 'origin/master' into permission-manager
# Conflicts:
# modules-available/backup/templates/_page.html
# style/default.css
Diffstat (limited to 'inc/taskmanager.inc.php')
| -rw-r--r-- | inc/taskmanager.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/taskmanager.inc.php b/inc/taskmanager.inc.php index 1920190f..dcf54448 100644 --- a/inc/taskmanager.inc.php +++ b/inc/taskmanager.inc.php @@ -96,7 +96,7 @@ class Taskmanager /** * Wait for the given task's completion. * - * @param type $task task to wait for + * @param array $task task to wait for * @param int $timeout maximum time in ms to wait for completion of task * @return array result/status of task, or false if it couldn't be queried */ |