Conflicts: NEWS SoObjects/Mailer/SOGoMailAccount.m SoObjects/SOGo/SOGoDefaults.plist SoObjects/SOGo/SOGoUser.m UI/MailerUI/UIxMailFolderActions.h UI/MailerUI/UIxMailFolderActions.m UI/MailerUI/product.plist |
||
---|---|---|
.. | ||
Localizable.strings |
Conflicts: NEWS SoObjects/Mailer/SOGoMailAccount.m SoObjects/SOGo/SOGoDefaults.plist SoObjects/SOGo/SOGoUser.m UI/MailerUI/UIxMailFolderActions.h UI/MailerUI/UIxMailFolderActions.m UI/MailerUI/product.plist |
||
---|---|---|
.. | ||
Localizable.strings |