6ffeba59ed
Conflicts: NEWS SoObjects/SOGo/SOGoUserDefaults.h SoObjects/SOGo/SOGoUserDefaults.m |
||
---|---|---|
.. | ||
Appointments | ||
Contacts | ||
Mailer | ||
SOGo | ||
common.make | ||
GNUmakefile |
6ffeba59ed
Conflicts: NEWS SoObjects/SOGo/SOGoUserDefaults.h SoObjects/SOGo/SOGoUserDefaults.m |
||
---|---|---|
.. | ||
Appointments | ||
Contacts | ||
Mailer | ||
SOGo | ||
common.make | ||
GNUmakefile |