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

Merge branch 'master' into fix-some-warnings

Browse Source 
Conflicts:
	SoObjects/Appointments/SOGoAppointmentObject.m
This commit is contained in:
Patrice Levesque
2016-02-15 11:23:27 -05:00
parent 9e83ff9f04 f2ffb52318
commit a5cc2bb5d5
66 changed files with 676 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Mailer/SOGoMailObject+Draft.m
+1 -2
View File
@@ -164,8 +164,7 @@
NSMutableArray *keys;
NSArray *acceptedTypes;
acceptedTypes
= [NSArray arrayWithObjects: @"text/plain", @"text/html", nil];
acceptedTypes = [NSArray arrayWithObjects: @"text/plain", @"text/html", nil];
keys = [NSMutableArray array];
[self addRequiredKeysOfStructure: [self bodyStructure]
path: @"" toArray: keys acceptedTypes: acceptedTypes