Merge branch 'zpull'

Conflicts: boot.php install/database.sql install/update.php
2013-09-19 01:10:10 -07:00 · 2013-09-19 01:10:10 -07:00 · c0e8b0cd9d
commit c0e8b0cd9d
parent 63fc92b9e5 5607737c39
1 changed files with 1 additions and 0 deletions
--- a/boot.php
+++ b/boot.php
@ -44,6 +44,7 @@ require_once('include/taxonomy.php');
 define ( 'RED_PLATFORM',            'Red Matrix' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     ); 
+
 define ( 'DB_UPDATE_VERSION',       1072  );

 define ( 'EOL',                    '<br />' . "\r\n"     );