diff options
author | Lesstat <florianbarth@gmx.de> | 2015-07-11 11:44:26 +0200 |
---|---|---|
committer | Lesstat <florianbarth@gmx.de> | 2015-07-11 11:44:26 +0200 |
commit | a85a1c613239c20fe72eb96c2921f4c220ec156b (patch) | |
tree | d032b4591e518cbbbfaa8886f8f5d98a6ea2efb7 /app/Template/task/transitions.php | |
parent | 5101eaa8060ce3c75a81a26f6e47aae40e3d4ac3 (diff) | |
parent | 7e94d0ca233d15d6124c0adf3f956a119c82ccae (diff) |
Merged branch 'master' of https://github.com/fguillot/kanboard
only imports conflicted
Diffstat (limited to 'app/Template/task/transitions.php')
-rw-r--r-- | app/Template/task/transitions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Template/task/transitions.php b/app/Template/task/transitions.php index 6455fd66..2ca2387f 100644 --- a/app/Template/task/transitions.php +++ b/app/Template/task/transitions.php @@ -19,7 +19,7 @@ <td><?= $this->e($transition['src_column']) ?></td> <td><?= $this->e($transition['dst_column']) ?></td> <td><?= $this->url->link($this->e($transition['name'] ?: $transition['username']), 'user', 'show', array('user_id' => $transition['user_id'])) ?></td> - <td><?= n(round($transition['time_spent'] / 3600, 2)).' '.t('hours') ?></td> + <td><?= $this->dt->duration($transition['time_spent']) ?></td> </tr> <?php endforeach ?> </table> |