39601a9cf9
Conflicts: SoObjects/Appointments/SOGoAppointmentFolder.h |
||
---|---|---|
.. | ||
Appointments | ||
Contacts | ||
Mailer | ||
SOGo | ||
GNUmakefile | ||
common.make |
39601a9cf9
Conflicts: SoObjects/Appointments/SOGoAppointmentFolder.h |
||
---|---|---|
.. | ||
Appointments | ||
Contacts | ||
Mailer | ||
SOGo | ||
GNUmakefile | ||
common.make |