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

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	install/schema_mysql.sql
	mod/impel.php
	view/pt-br/messages.po
	view/pt-br/strings.php
This commit is contained in:
redmatrix
2015-05-28 19:06:31 -07:00
parent b381ec5734 df5223fe98
commit 8fe3daab21
10 changed files with 4443 additions and 2877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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