merge of '53583144c5d999d03c432c06fcea467dcb2b4988'

and 'ba80cda7e44181710c6bab1a4dbafe1c4da06a57'

Monotone-Parent: 53583144c5d999d03c432c06fcea467dcb2b4988
Monotone-Parent: ba80cda7e44181710c6bab1a4dbafe1c4da06a57
Monotone-Revision: 1bafb5734a88e44a2e54a0ecf6daae5cee2a0f57

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-01-07T19:07:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle 2010-01-07 19:07:11 +00:00
commit bfd2d9f070
2 changed files with 2 additions and 2 deletions

2
NEWS
View file

@ -1,4 +1,4 @@
1.1-yyyymmdd (1.1.1)
1.2-yyyymmdd (1.2.0)
--------------------
- improved handling of popup windows when closing the parent window
- major refresh of CSS

View file

@ -48,7 +48,7 @@
SOGoMailMessageForwarding = "inline";
SOGoMailReplyPlacement = "below";
SOGoMailSignaturePlacement = "below";
SOGoMailPollingIntervals = ( 1, 2, 5, 10, 20, 30, 30 );
SOGoMailPollingIntervals = ( 1, 2, 5, 10, 20, 30, 60 );
SOGoMailComposeMessageType = "text";
SOGoMailListViewColumnsOrder = ( "Flagged", "Attachment", "Subject",
"From", "Unread", "Date", "Priority",