Merge remote-tracking branch 'upstream/develop' into relayed-dfrn-dspr

[friendica.git] / static / settings.config.php

diff --git a/static/settings.config.php b/static/settings.config.php
index e999b78c4307200f53e89a9aad8a11c74619d265..c05e675edb76012961a2e72034f472d399379307 100644 (file)
--- a/static/settings.config.php
+++ b/static/settings.config.php
@@ -156,10 +156,18 @@ return [
                // Periodically (once an hour) run an "optimize table" command for cache tables
                'optimize_tables' => false,
 
+               // relay_deny_tags (String)
+               // Comma separated list of tags that are rejected.
+               'relay_deny_tags' => '',
+
                // relay_server (String)
                // Address of the relay server where public posts should be send to.
                'relay_server' => 'https://social-relay.isurf.ca',
 
+               // relay_server_tags (String)
+               // Comma separated list of tags for the "tags" subscription.
+               'relay_server_tags' => '',
+
                // relay_user_tags (Boolean)
                // If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags".
                'relay_user_tags' => true,