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

2 files changed, 11 insertions, 3 deletions

diff --git a/boot.php b/boot.php
index 6ec679408..e7ed7dcee 100755
--- a/boot.php
+++ b/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.
diff --git a/install/update.php b/install/update.php
index d0ea4d147..d0a0454fb 100644
--- a/install/update.php
+++ b/install/update.php
@@ -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;
 
-}
\ No newline at end of file
+}
+
+function update_r1150() {
+
+	// hubzilla update does not apply here, but we're keeping the numbers in sync
+	return UPDATE_SUCCESS;
+
+}
+