Conflicts:
	include/identity.php
	install/update.php
	util/messages.po
	view/nl/messages.po
This commit is contained in:
redmatrix
2015-08-31 21:00:28 -07:00
10 changed files with 224 additions and 192 deletions

View File

@@ -50,7 +50,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H');
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1148 );
define ( 'DB_UPDATE_VERSION', 1149 );
/**
* @brief Constant with a HTML line break.
@@ -83,7 +83,6 @@ $DIRECTORY_FALLBACK_SERVERS = array(
'https://red.zottel.red',
'https://gravizot.de',
'https://my.federated.social',
'https://redmatrix.nl'
);