aboutsummaryrefslogtreecommitdiffstats
path: root/htconfig.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-12-12 20:13:12 -0800
committerfriendica <info@friendica.com>2011-12-12 20:13:12 -0800
commited725df5f1c1ea2484c689283e93f8f825591384 (patch)
tree289183e66da097acfeaeb0c7bfe9099a87a5a86a /htconfig.php
parent50c4b9a7803c08d6e41fc64ca3ffeb66c7f450ba (diff)
parentee4975f1cd9f205e2300f3e22e51079c5e26f155 (diff)
downloadvolse-hubzilla-ed725df5f1c1ea2484c689283e93f8f825591384.tar.gz
volse-hubzilla-ed725df5f1c1ea2484c689283e93f8f825591384.tar.bz2
volse-hubzilla-ed725df5f1c1ea2484c689283e93f8f825591384.zip
Merge branch 'master' into notify
Diffstat (limited to 'htconfig.php')
-rw-r--r--htconfig.php11
1 files changed, 0 insertions, 11 deletions
diff --git a/htconfig.php b/htconfig.php
index 0f9222ac5..89c226e9b 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -69,14 +69,3 @@ $a->config['system']['rino_encrypt'] = true;
$a->config['system']['theme'] = 'duepuntozero';
-// Addons or plugins are configured here.
-// This is a comma seperated list of addons to enable. Example:
-// $a->config['system']['addon'] = 'js_upload,randplace,oembed';
-
-$a->config['system']['addon'] = 'js_upload';
-
-
-// Disable oembed embedding
-// This disable the conversion of [embed]$url[/embed] tag in html
-// $a->config['system']['no_oembed'] = true;
-