Commit 89c85478 by Bruce Sherrod

Merge branch 'master' of github.com:bruce-lyft/grafana

parents 5087cd2b d8b86a89
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<markdown ng-show="ready && panel.mode == 'markdown'"> <markdown ng-show="ready && panel.mode == 'markdown'">
{{panel.content}} {{panel.content}}
</markdown> </markdown>
<p ng-show="panel.mode == 'text'" ng-style='panel.style' ng-bind-html="panel.content | striphtml | newlines"> <p ng-show="panel.mode == 'text'" ng-style='panel.style' ng-bind-html-unsafe="panel.content | striphtml | newlines">
</p> </p>
<p ng-show="panel.mode == 'html'" ng-bind-html="panel.content"> <p ng-show="panel.mode == 'html'" ng-bind-html-unsafe="panel.content">
</p> </p>
</div> </div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment