aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy-dark/jot-header.tpl
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-04-15 05:12:14 -0700
committerfriendica <info@friendica.com>2012-04-15 05:12:14 -0700
commit97715c73fcb5b6de582f7165f70526acaf24bc86 (patch)
tree5eaa59eaafef68b4c611333776e464ad08954bc4 /view/theme/dispy-dark/jot-header.tpl
parent0a3454c841e343a21ac637ae169c267442914ea0 (diff)
parentf299749758112361ee6384cd75d11b2c3a57352a (diff)
downloadvolse-hubzilla-97715c73fcb5b6de582f7165f70526acaf24bc86.tar.gz
volse-hubzilla-97715c73fcb5b6de582f7165f70526acaf24bc86.tar.bz2
volse-hubzilla-97715c73fcb5b6de582f7165f70526acaf24bc86.zip
Merge https://github.com/friendica/friendica into pull
Diffstat (limited to 'view/theme/dispy-dark/jot-header.tpl')
-rw-r--r--view/theme/dispy-dark/jot-header.tpl3
1 files changed, 1 insertions, 2 deletions
diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl
index 44120da40..c55ac503a 100644
--- a/view/theme/dispy-dark/jot-header.tpl
+++ b/view/theme/dispy-dark/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,
@@ -346,4 +346,3 @@ function enableOnUser(){
}
</script>
-