Merge https://github.com/redmatrix/redmatrix into pending_merge
This commit is contained in:
commit
360fda15e9
2
boot.php
2
boot.php
@ -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', 1150 );
|
||||
define ( 'DB_UPDATE_VERSION', 1151 );
|
||||
|
||||
/**
|
||||
* @brief Constant with a HTML line break.
|
||||
|
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
define( 'UPDATE_VERSION' , 1150 );
|
||||
define( 'UPDATE_VERSION' , 1151 );
|
||||
|
||||
/**
|
||||
*
|
||||
@ -1775,4 +1775,12 @@ function update_r1149() {
|
||||
return UPDATE_SUCCESS;
|
||||
return UPDATE_FAILED;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
function update_r1150() {
|
||||
|
||||
// hubzilla update does not apply here, but we're keeping the numbers in sync
|
||||
return UPDATE_SUCCESS;
|
||||
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user