aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-12-05 11:26:07 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-12-05 11:26:07 +0100
commit7119976199f0c2cd4766a073609e6c76bdc9c30f (patch)
treeaa3f6a6bcbb96849670efad7d8a1d8e2fb972511 /boot.php
parentdd7edc8ced15be66ebf830baaf8f909d16457d46 (diff)
parent4428f70ea292f1800ffde39ea49732628e83f862 (diff)
downloadvolse-hubzilla-7119976199f0c2cd4766a073609e6c76bdc9c30f.tar.gz
volse-hubzilla-7119976199f0c2cd4766a073609e6c76bdc9c30f.tar.bz2
volse-hubzilla-7119976199f0c2cd4766a073609e6c76bdc9c30f.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index 2b1f3cb4e..48d81ff59 100755
--- a/boot.php
+++ b/boot.php
@@ -48,7 +48,7 @@ require_once('include/AccessList.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H');
-define ( 'STD_VERSION', '0.11.1' );
+define ( 'STD_VERSION', '1.0' );
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1160 );
@@ -84,8 +84,8 @@ $DIRECTORY_FALLBACK_SERVERS = array(
'https://hubzilla.site',
'https://red.zottel.red',
'https://gravizot.de',
- 'https://blablanet.com',
- 'https://my.federated.social'
+ 'https://my.federated.social',
+ 'https://hubzilla.nl'
);