Conflicts:
	install/schema_mysql.sql
	mod/home.php
	mod/page.php
	view/nl/messages.po
	view/nl/strings.php
This commit is contained in:
redmatrix
2015-06-09 16:52:00 -07:00
17 changed files with 304 additions and 255 deletions
+1 -1
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', 1142 );
define ( 'DB_UPDATE_VERSION', 1143 );
/**
* @brief Constant with a HTML line break.