Merge branch 'develop' into rewrites/coding-convention-split2

[friendica.git] / htconfig.php

diff --git a/htconfig.php b/htconfig.php
index f98e9efc067a058f9bd149d6523584c415c6bea4..5967e79f4e1efec7ca934aea20d801c343833945 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -26,6 +26,10 @@ $a->config['system']['db_charset'] = "utf8mb4";
 
 $default_timezone = 'America/Los_Angeles';
 
+// Default system language
+
+$a->config['system']['language'] = 'en';
+
 // What is your site name?
 
 $a->config['sitename'] = "Friendica Social Network";
@@ -60,9 +64,15 @@ $a->config['php_path'] = 'php';
 
 $a->config['system']['huburl'] = '[internal]';
 
+// Server-to-server private message encryption (RINO) is allowed by default.
+// Encryption will only be provided if this setting is set to a non zero value
+// set to 0 to disable, 2 to enable, 1 is deprecated
+
+$a->config['system']['rino_encrypt'] = 2;
+
 // allowed themes (change this from admin panel after installation)
 
-$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero';
+$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero,smoothly';
 
 // default system theme