aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-01-16 16:52:21 -0800
committerzotlabs <mike@macgirvin.com>2019-01-16 16:52:21 -0800
commit7e29bd10b6a59bc9c1700cfb84dbefb6a8930153 (patch)
treeac49731f7ed9a5071bd4fcf76faaa2003204064c /boot.php
parent20eea2184bc1336efb811c29e3fb49262ae02262 (diff)
parentde8582ec07d125bf1c7f08cc3d695c33aaaf9d85 (diff)
downloadvolse-hubzilla-7e29bd10b6a59bc9c1700cfb84dbefb6a8930153.tar.gz
volse-hubzilla-7e29bd10b6a59bc9c1700cfb84dbefb6a8930153.tar.bz2
volse-hubzilla-7e29bd10b6a59bc9c1700cfb84dbefb6a8930153.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 410aa91b1..321f1a93b 100755
--- a/boot.php
+++ b/boot.php
@@ -84,7 +84,8 @@ define ( 'DIRECTORY_FALLBACK_MASTER', 'https://zotadel.net');
$DIRECTORY_FALLBACK_SERVERS = array(
'https://hubzilla.zottel.net',
- 'https://zotadel.net'
+ 'https://zotadel.net',
+ 'https://zotsite.net'
);