aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-12 06:28:40 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-12 06:28:40 +0100
commitac4a8fde3a662f4f8918177ae4e5decefdc2ad11 (patch)
treed8929c45e08c903ae92366756ce408d01a676e29 /boot.php
parent95c686de6edd5d5e6b85a5f283770441fb7852ea (diff)
parent31aaf40ade183c91e8691ef7361237f87d713fd2 (diff)
downloadvolse-hubzilla-ac4a8fde3a662f4f8918177ae4e5decefdc2ad11.tar.gz
volse-hubzilla-ac4a8fde3a662f4f8918177ae4e5decefdc2ad11.tar.bz2
volse-hubzilla-ac4a8fde3a662f4f8918177ae4e5decefdc2ad11.zip
Merge remote-tracking branch 'upstream/master'
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 cc46cf870..9729939e1 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')));
-define ( 'STD_VERSION', '1.2.1' );
+define ( 'STD_VERSION', '1.2.2' );
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1161 );
@@ -85,6 +85,7 @@ $DIRECTORY_FALLBACK_SERVERS = array(
'https://hubzilla.zottel.net',
'https://hub.pixelbits.de',
'https://my.federated.social',
+ 'https://blablanet.es',
'https://hubzilla.nl'
);