aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/jot-header.tpl
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-15 16:49:54 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-15 16:49:54 +0200
commita147d6113c081694d4209002fa5e57106d4c6f41 (patch)
treede6f940efa0439ab3d54ff7d280e221b7b59d348 /view/theme/dispy/jot-header.tpl
parente825a73f1de308b6ae0ae3cc5549263704a14594 (diff)
parentf994f9abc6092106659a29f5ee1be0706825c203 (diff)
downloadvolse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.tar.gz
volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.tar.bz2
volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.zip
Merge commit 'upstream/master'
Diffstat (limited to 'view/theme/dispy/jot-header.tpl')
-rw-r--r--view/theme/dispy/jot-header.tpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 44120da40..5838729cc 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -36,7 +36,7 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
- force_p_newlines : true,
+ force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
convert_urls: false,