LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merged the stuff

Browse source 
Monotone-Parent: 1a4c87b6d951f04cfe7725514b38d62ac6e8238d
Monotone-Revision: 710426e98f0728c70e579d7b3463e5b685fd05d9

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-06-02T12:25:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte 2009-06-02 12:25:11 +00:00
parent bd830dc011
commit dfc2704303
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,4 +1,3 @@
<<<<<<< variant A
2009-06-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailFolderActions.m (-deleteFolderAction):
@ -10,14 +9,11 @@
* 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