Merge branch 'master' into tres

Conflicts: include/socgraph.php
2015-01-27 20:00:43 -08:00
parent 0bfbe6d61d 145b30adfc
commit a2cdd1499c
20 changed files with 304 additions and 168 deletions
--- 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.