Ludovic Marcotte 9b0a2c5fae Merge branch 'master' into feature/addMissingStrings2 ...

Conflicts:
	UI/AdministrationUI/English.lproj/Localizable.strings
	UI/PreferencesUI/English.lproj/Localizable.strings
	UI/Templates/PreferencesUI/UIxFilterEditor.wox

2015-12-03 11:16:17 -05:00

..

Appointments

Merge branch 'master' into feature/addMissingStrings2

2015-12-03 11:16:17 -05:00

Contacts

(fix) reverted change for #3389

2015-12-01 11:41:18 -05:00

Mailer

(fix) handle emails having an attachment as their content

2015-11-05 15:21:33 -05:00

SOGo

(feat) you can now select your alternate avatar

2015-11-27 16:04:12 -05:00

common.make

Improved and simplified rpath

2014-10-02 12:36:22 -04:00

GNUmakefile

See ChangeLog

2009-10-09 21:54:07 +00:00