Merge remote-tracking branch 'friendica/master' into randomerror

1 files changed, 7 insertions, 0 deletions

diff --git a/htconfig.php b/htconfig.php
index cb6e7b784..01f56f2c4 100755
--- a/htconfig.php
+++ b/htconfig.php
@@ -32,6 +32,9 @@ $a->config['sitename'] = "Friendica Social Network";
 // to the email address of an already registered person who can authorise
 // and/or approve/deny the request. 
 
+// In order to perform system administration via the admin panel, admin_email
+// must precisely match the email address of the person logged in.
+
 $a->config['register_policy'] = REGISTER_OPEN;
 $a->config['register_text'] = '';
 $a->config['admin_email'] = '';
@@ -64,6 +67,10 @@ $a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
 
 $a->config['system']['rino_encrypt'] = true;
 
+// allowed themes (change this from admin panel after installation)
+
+$a->config['system']['allowed_themes'] = 'dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr';
+
 // default system theme
 
 $a->config['system']['theme'] = 'duepuntozero';