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

Fixed merge

Browse Source 
Monotone-Parent: 6eabcf880fa6d4620fb9a1ed111b15bef9bd9877
Monotone-Revision: 2252f3047b058ea629e568aec7efb2b0432e3c0c

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T14:09:37
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2012-07-11 14:09:37 +00:00
parent 569949bae7
commit d932f1fd47
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,11 +1,9 @@
<<<<<<< variant A
2012-07-11 Ludovic Marcotte <lmarcotte@inverse.ca>
* Finished the implementation and testing of the two
new defaults. Also added documentation in the SOGo Installation
and Configuration Guide.
>>>>>>> variant B
2012-07-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -26,8 +24,6 @@
(-resultForDAVBoolean:): new method that returns a BOOL from a DAV
boolean.
####### Ancestor
======= end
2012-07-09 Ludovic Marcotte <lmarcotte@inverse.ca>
* Dropped old templates (SOGoAptMailDeletionReceipt.wox