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

Fixed merge 

Monotone-Parent: bfc3cb63453015f444ec1a1fd20faeece6be2042
Monotone-Revision: bdb3c86bf127fecd411885ad5bcf84eb8af9f672

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-20T18:24:52
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2012-07-20 18:24:52 +00:00
parent e5921464c9
commit 136c6dd92d
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/MailerUI.js (onEmailTo): append the email