Merge remote-tracking branch 'origin/dev' into dev

8 years ago · d8c38fe32d
parent 98883fa2c3 5b98faaa5d
commit d8c38fe32d
2 changed files with 2 additions and 2 deletions
--- a/apps/course/templates/course/content/imagetext.html
+++ b/apps/course/templates/course/content/imagetext.html
@ -2,7 +2,7 @@
  {{ content.title }}
 </div>
 <div class="content-block text">
-  {{ content.txt }}
+  {{ content.txt | safe }}
 </div>
 <div>
  <img class="content-block pic" src="{{ content.img.image.url }}" alt="">
--- a/apps/course/templates/course/content/text.html
+++ b/apps/course/templates/course/content/text.html
@ -2,5 +2,5 @@
 {{ content.title }}
 </div>
 <div class="content-block text">
-{{ content.txt }}
+{{ content.txt | safe }}
 </div>