From e6fb2fc97f1c69d55eda79c52a5d4f790f699141 Mon Sep 17 00:00:00 2001
From: tassium <tassium@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 15 Sep 2003 14:12:01 +0000
Subject: [PATCH] Mention merc/32 defaults in conf.pl

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5722 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 1e5a97cc..902c233d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,7 @@ Version 1.5.0 -- CVS
   - New hook function: boolean_hook_function()  Used for true/false hooks.
   - Calendar plugin: in month view, display events on the same day sorted by time,
     and include the time of the event in its tooltip.
+  - Added default settings for Mercury/32 to conf.pl.
 
 **************************************
 *** SquirrelMail Stable Series 1.4 ***
-- 
2.25.1