merging

12 years ago · 008d903240
parent 551a38b623 eb29f44a2f
commit 008d903240
2 changed files with 7 additions and 7 deletions
--- a/archive/index.html
+++ b/archive/index.html
@ -1,6 +1,6 @@
-<html>
-<head>
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 </head>
 <body>
-</body>
-</html>
+
+</body></html>
--- a/main/install/version.php
+++ b/main/install/version.php
@ -11,10 +11,10 @@
 /**
 * Variables used from the main/install/index.php
 */
-$new_version            = '1.9.4';
-$new_version_status     = 'stable';
+$new_version            = '1.9.6';
+$new_version_status     = 'dev';
 $new_version_last_id	= 0;
-$new_version_stable 	= true;
+$new_version_stable 	= false;
 $new_version_major      = false;
 $software_name          = 'Chamilo';
 $software_url           = 'http://www.chamilo.org/';