Merge branch 'master' into tres

This commit is contained in:
redmatrix
2015-05-14 22:12:56 -07:00
19 changed files with 537 additions and 18 deletions

View File

@@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1140 );
define ( 'DB_UPDATE_VERSION', 1141 );
/**
* @brief Constant with a HTML line break.