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

Fixed merge

Browse source 
Monotone-Parent: a7a764a2e6fd01790136451d2f144d9b934d1e8e
Monotone-Revision: 631e9fa8454aae26e4c7eaa71bfe9e18c0f4b7e5

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-20T18:21:59
This commit is contained in:
Ludovic Marcotte 2012-07-20 18:21:59 +00:00
parent 3e980d12af
commit d63d4ee19e
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,11 +1,9 @@
<<<<<<< variant A
2012-07-20 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/MailPartViewers/UIxMailRenderingContext.m
(_shouldDisplayAsAttachment:): refactored to consider
the "bodyId" parameter only for non text/* parts.
>>>>>>> variant B
2012-07-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
@ -13,8 +11,6 @@
return immediately if the occurrence does not have a valid
recurrence-id.
####### Ancestor
======= end
2012-07-20 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/MailerUI.js (onEmailTo): append the email