Merge remote-tracking branch 'origin/master'

public/react/src/modules/courses/boards/TopicDetail.js

@@ -648,7 +648,9 @@ class TopicDetail extends Component {
 
                     
                     <div className="padding30 memoContent new_li" style={{ paddingBottom: '10px'}}>
-                      <MarkdownToHtml content={memo.content}></MarkdownToHtml>
+                      {memo.is_md == true ? <MarkdownToHtml content={memo.content}></MarkdownToHtml> : 
+                        <div dangerouslySetInnerHTML={{ __html: memo.content }}></div>
+                      }
                     </div>
                     <div className="padding30 bor-bottom-greyE" style={{paddingTop: '2px'}}>
                         <div className="mt10 mb20">