59ad8a2e5a
Conflicts: SoObjects/Mailer/SOGoMailFolder.h SoObjects/SOGo/SOGoGCSFolder.m |
||
---|---|---|
.. | ||
Appointments | ||
Contacts | ||
Mailer | ||
SOGo | ||
common.make | ||
GNUmakefile |
59ad8a2e5a
Conflicts: SoObjects/Mailer/SOGoMailFolder.h SoObjects/SOGo/SOGoGCSFolder.m |
||
---|---|---|
.. | ||
Appointments | ||
Contacts | ||
Mailer | ||
SOGo | ||
common.make | ||
GNUmakefile |