Merge branch 'master' into fix-some-warnings

Conflicts:
	SoObjects/Appointments/SOGoAppointmentObject.m
This commit is contained in:
Patrice Levesque
2016-02-15 11:23:27 -05:00
66 changed files with 676 additions and 343 deletions
@@ -675,6 +675,12 @@
return [self saveCalendar: [newObject parent]];
}
- (NSException *) saveComponent: (iCalRepeatableEntityObject *) newEvent
force: (BOOL) forceSave
{
return [self saveComponent: newEvent];
}
/* raw saving */
/* EMail Notifications */