Merge branch 'master' of git@github.com:ktgit/knowledgetree

Megan
2 parents a77f70a8 710b533b
Showing 5 changed files with 7 additions and 7 deletions
docs/VERSION-NAME.txt
docs/VERSION-OSS-DEV.txt
docs/VERSION-OSS.txt
docs/VERSION.txt
sql/mysql/install/data.sql
-3.6
+3.6.0
-3.6
+3.6.0
-3.6
+3.6.0
-3.6
+3.6.0
@@ -1450,8 +1450,8 @@ LOCK TABLES `system_settings` WRITE;
 /*!40000 ALTER TABLE `system_settings` DISABLE KEYS */;
 INSERT INTO `system_settings` VALUES
 (1,'lastIndexUpdate','0'),
-(2,'knowledgeTreeVersion','3.5.5'),
-(3,'databaseVersion','3.5.5'),
+(2,'knowledgeTreeVersion','3.6.0'),
+(3,'databaseVersion','3.6.0'),
 (4,'server_name','127.0.0.1');
 /*!40000 ALTER TABLE `system_settings` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -1745,7 +1745,7 @@ INSERT INTO `upgrades` VALUES
 (214,'func*3.5.4a*0*removeOldFilesAndFolders354a','Remove old files and folders that are no longer needed.','2008-10-01 00:00:00',1,'upgrade*3.5.4a*99*upgrade3.5.4a'),
 (215,'func*3.5.4a*0*removeOldFilesAndFolders354a1','Remove old files and folders that are no longer needed.','2008-10-01 00:00:00',1,'upgrade*3.5.4a*99*upgrade3.5.4a'),
 (216,'upgrade*3.5.4a*99*upgrade3.5.4a','Upgrade from version 3.5.4 to 3.5.4a','2008-12-01 00:00:00',1,'upgrade*3.5.4a*99*upgrade3.5.4a'),
-(217,'upgrade*3.5.5*99*upgrade3.5.5','Upgrade from version 3.5.4a to 3.5.5','2009-01-01 00:00:00',1,'upgrade*3.5.5*99*upgrade3.5.5');
+(217,'upgrade*3.6.0*99*upgrade3.6.0','Upgrade from version 3.5.4a to 3.6.0','2009-01-01 00:00:00',1,'upgrade*3.6.0*99*upgrade3.6.0');
 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
 UNLOCK TABLES;