Merge branch 'master' into develop

2019-01-21 10:04:26 +01:00
parent 36120615dd 94ed7bf163
commit 08206fdcc0
29 changed files with 135 additions and 133 deletions
--- a/mathjax/templates/settings.tpl
+++ b/mathjax/templates/settings.tpl
@@ -6,7 +6,7 @@
 	<span class="fakelink" onclick="openClose('settings_mathjax_expanded'); openClose('settings_mathjax_inflated');">
 		<h3>{{$title}}</h3>
 	</span>
-	<p>{{$description}}</p>
+	<p>{{$description nofilter}}</p>
 	{{include file="field_checkbox.tpl" field=$mathjax_use}}
 	<div class="clear"></div>