Commit 60f207aa authored by hannes's avatar hannes

Merge branch 'master' into 'master'

Preserve p tags so that Mastodon notices render properly

See merge request !95
parents 3ea6c031 a8e8a4b3
......@@ -2308,9 +2308,9 @@ function buildQueetHtml(obj, idInStream, extraClasses, requeeted_by, isConversat
// if statusnetHTML is contains <p>:s, unwrap those (diaspora..)
// bookmarks created by the bookmark plugin get's a tooltip
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