diff options
author | zotlabs <mike@macgirvin.com> | 2019-01-16 16:52:21 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2019-01-16 16:52:21 -0800 |
commit | 7e29bd10b6a59bc9c1700cfb84dbefb6a8930153 (patch) | |
tree | ac49731f7ed9a5071bd4fcf76faaa2003204064c /boot.php | |
parent | 20eea2184bc1336efb811c29e3fb49262ae02262 (diff) | |
parent | de8582ec07d125bf1c7f08cc3d695c33aaaf9d85 (diff) | |
download | volse-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-x | boot.php | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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' ); |