Merge remote-tracking branch 'upstream/develop' into develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder
2016-12-31 17:59:14 +01:00
8 changed files with 289 additions and 127 deletions

View File

@@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_CODENAME', 'Asparagus');
define ( 'FRIENDICA_VERSION', '3.5.1-dev' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1210 );
define ( 'DB_UPDATE_VERSION', 1211 );
/**
* @brief Constant with a HTML line break.