aboutsummaryrefslogtreecommitdiffstats
path: root/htconfig.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-02-01 10:17:27 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2011-02-01 10:17:27 +0100
commit042aa2e169310bc23398d0558455a61fe1e86a92 (patch)
tree50ae4d8845bc16e2edfbaa916e80d8709ee3fe86 /htconfig.php
parent1151124feed13ebe1bf87bdcebf9692a5ce6233e (diff)
parent89313235d26569df5cbdabb1f85871f10056e41f (diff)
downloadvolse-hubzilla-042aa2e169310bc23398d0558455a61fe1e86a92.tar.gz
volse-hubzilla-042aa2e169310bc23398d0558455a61fe1e86a92.tar.bz2
volse-hubzilla-042aa2e169310bc23398d0558455a61fe1e86a92.zip
Merge remote branch 'friendika-master/master'
Diffstat (limited to 'htconfig.php')
-rw-r--r--htconfig.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/htconfig.php b/htconfig.php
index 13c065e69..5f5c76cbd 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -72,4 +72,7 @@ $a->config['system']['rino_encrypt'] = true;
$a->config['system']['addon'] = 'js_upload';
- \ No newline at end of file
+// Disable oembed embedding
+// This disable the conversion of [embed]$url[/embed] tag in html
+// $a->config['system']['no_oembed'] = true;
+