harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	include/zot.php
	install/schema_mysql.sql
	install/schema_postgres.sql
	install/update.php
	mod/zfinger.php
This commit is contained in:
redmatrix
2015-10-19 16:18:04 -07:00
parent 9f424bb208 599a0c66b2
commit ea37882b95
11 changed files with 7711 additions and 7397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
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', 1157 );
define ( 'DB_UPDATE_VERSION', 1158 );
/**
* @brief Constant with a HTML line break.