amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-11 16:28:51 +00:00
Code Issues Projects Releases Wiki Activity

merge of '35bb8c54877a2413065ebbe25721294d096fa5e8'

Browse Source 
and '4460dc88c76a37f4ac0d64f2247e8e155254ca11'

Monotone-Parent: 35bb8c54877a2413065ebbe25721294d096fa5e8
Monotone-Parent: 4460dc88c76a37f4ac0d64f2247e8e155254ca11
Monotone-Revision: 1a4c87b6d951f04cfe7725514b38d62ac6e8238d

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-06-02T12:24:41
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2009-06-02 12:24:41 +00:00
parent ac6b0209a1 d6f1ee5e89
commit bd830dc011
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,4 @@
<<<<<<< variant A
2009-06-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailFolderActions.m (-deleteFolderAction):
@@ -9,6 +10,14 @@
* SoObjects/SOGo/SOGoPermissions.m: declared new "Delete Object"
permission.
>>>>>>> variant B
2009-06-01 Cyril Robert <crobert@inverse.ca>
* UI/WebServerResources/UIxContactsUserFolders.js (onSearchFormSubmit):
Fixed encoding issue/crash.
####### Ancestor
======= end
2009-05-30 Ludovic Marcotte <lmarcotte@inverse.ca>
* Modified SOGoCalendarComponent.m so that we