X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=ChangeLog;h=0cb01b4ffc0bd5b375e14c472cf7a65b16c322a6;hp=cde4b3245fba47bd41aa22393a92007c04699259;hb=35be4418912d6b69664a20f24d1c2453d2925b4e;hpb=e2b6aa408e0e7446ca0fa0a05b28356c8df1946a

diff --git a/ChangeLog b/ChangeLog
index cde4b324..0cb01b4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,11 @@ Version 1.2.5 -- CVS
   - Made searching on multiple criteria possible, with thanks to Jason Munro
   - Fixed 'list all' in addressbook (#506624, thanks to Kurt Yoder)
   - Fixed a small bug in db_prefs
+  - Allowed SquirrelMail to work from within a frame, eg. not using _top
+    this is configureable. (thanks to Simon Dick)
+  - Added options to conf.pl to enable automated plugin installation:
+    ./conf.pl --install-plugin <pluginname>. This allows plugins to be
+    distributed in packages. Conf.pl now also reports when saving fails.
 	
 Version 1.2.4 -- 25 January 2002
 --------------------------------