Converted main trunk to 1.1

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1141 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index f8ca3d0ddbf14ff677cb0edf7cbbc60f46112751..0d727f78d66f5398c8af72ed1723c952f01d36ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
+Version 1.1.0 -- DEVELOPMENT
+----------------------------
+- Added collapseable folder listing (an option that can be turned on)
+
 Version 1.0.3 -- DEVELOPMENT
 ----------------------------
 - Made folder drop-down list consistant in look to the other drop-downs
-- Added collapseable folder listing (an option that can be turned on)
 
 Version 1.0.2 -- February 8, 2001 
 ---------------------------------

diff --git a/functions/strings.php b/functions/strings.php
index bac77cb20e99ebf18263697f21757ece7847bd0a..67409c078d4dc1dc465347027f8fdfa33a8fcd8d 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -289,7 +289,7 @@
    }
 
    /* SquirrelMail version number -- DO NOT CHANGE */
-   $version = '1.0.3 [cvs]';
+   $version = '1.1.0 [cvs]';
 
 
    function find_mailbox_name ($mailbox) {