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

Conflicts:
	include/zot.php
	install/schema_mysql.sql
	install/schema_postgres.sql
	install/update.php
	mod/zfinger.php

1 files changed, 1 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index b66606ca7..cdf3c302b 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',       1157  );
+define ( 'DB_UPDATE_VERSION',       1158  );
 
 /**
  * @brief Constant with a HTML line break.