Merge remote branch 'upstream/master'

[friendica.git] / view / de / htconfig.tpl

diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
old mode 100644 (file)
new mode 100755 (executable)
index 0ce28b4..c535cef
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -33,7 +33,7 @@ $a->config['sitename'] = "My Friend Network";
 
 $a->config['register_policy'] = REGISTER_OPEN;
 $a->config['register_text'] = '';
-$a->config['admin_email'] = '';
+$a->config['admin_email'] = '$adminmail';
 
 // Maximum size of an imported message, 0 is unlimited
 
@@ -66,9 +66,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';
-