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/subtask | |
| parent | 5101eaa8060ce3c75a81a26f6e47aae40e3d4ac3 (diff) | |
| parent | 7e94d0ca233d15d6124c0adf3f956a119c82ccae (diff) | |
Merged branch 'master' of https://github.com/fguillot/kanboard
only imports conflicted
Diffstat (limited to 'app/Template/subtask')
| -rw-r--r-- | app/Template/subtask/show.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Template/subtask/show.php b/app/Template/subtask/show.php index b91e830f..cc82a74e 100644 --- a/app/Template/subtask/show.php +++ b/app/Template/subtask/show.php @@ -48,7 +48,7 @@ <?php if ($subtask['is_timer_started']): ?> <i class="fa fa-pause"></i> <?= $this->url->link(t('Stop timer'), 'timer', 'subtask', array('timer' => 'stop', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'])) ?> - (<?= $this->datetime->age($subtask['timer_start_date']) ?>) + (<?= $this->dt->age($subtask['timer_start_date']) ?>) <?php else: ?> <i class="fa fa-play-circle-o"></i> <?= $this->url->link(t('Start timer'), 'timer', 'subtask', array('timer' => 'start', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'])) ?> |