Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/Job/NotificationJob.php

1 files changed, 2 insertions, 0 deletions

diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php
index e1d65cca..481a5efb 100644
--- a/app/Helper/TaskHelper.php
+++ b/app/Helper/TaskHelper.php
@@ -50,6 +50,7 @@ class TaskHelper extends Base
     public function selectDescription(array $values, array $errors)
     {
         $html = $this->helper->form->label(t('Description'), 'description');
+        $html .= '<div class="markdown-editor-container">';
         $html .= $this->helper->form->textarea(
             'description',
             $values,
@@ -62,6 +63,7 @@ class TaskHelper extends Base
             'markdown-editor'
         );
 
+        $html .= '</div>';
         return $html;
     }