Merge branch 'master' into tres

Conflicts:
	include/socgraph.php

1 files changed, 1 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 31d4ea1e7..bd506db5e 100755
--- a/boot.php
+++ b/boot.php
@@ -49,7 +49,7 @@ define ( 'RED_PLATFORM',            'redmatrix' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     );
 
-define ( 'DB_UPDATE_VERSION',       1134  );
+define ( 'DB_UPDATE_VERSION',       1135  );
 
 /**
  * Constant with a HTML line break.