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/activity.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/activity.php')
-rw-r--r-- | app/Template/task/activity.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/Template/task/activity.php b/app/Template/task/activity.php deleted file mode 100644 index cc4aad03..00000000 --- a/app/Template/task/activity.php +++ /dev/null @@ -1,5 +0,0 @@ -<div class="page-header"> - <h2><?= t('Activity stream') ?></h2> -</div> - -<?= $this->render('event/events', array('events' => $events)) ?>
\ No newline at end of file |