Patrice Levesque a5cc2bb5d5 Merge branch 'master' into fix-some-warnings ...

Conflicts:
	SoObjects/Appointments/SOGoAppointmentObject.m

2016-02-15 11:23:27 -05:00

..

AdministrationUI

Remove pointless #imports from .m and .h files

2016-02-13 16:11:52 -05:00

Common

Remove pointless #imports from .m and .h files

2016-02-13 16:11:52 -05:00

Contacts

Remove pointless #imports from .m and .h files

2016-02-13 16:11:52 -05:00

MailerUI

Merge branch 'master' into fix-some-warnings

2016-02-15 11:23:27 -05:00

MailPartViewers

Fix compilation errors with OpenSSL

2016-02-15 11:14:06 -05:00

MainUI

Remove pointless #imports from .m and .h files

2016-02-13 16:11:52 -05:00

PreferencesUI

Merge branch 'master' into fix-some-warnings

2016-02-15 11:23:27 -05:00

Scheduler

Merge branch 'master' into fix-some-warnings

2016-02-15 11:23:27 -05:00

SOGoElements

Load XMLHttpRequest conditionally (< IE9)

2013-12-18 22:18:08 -05:00

SOGoUI

Remove pointless #imports from .m and .h files

2016-02-13 16:11:52 -05:00

Templates

(feature) Custom base font size for HTML messages

2016-02-11 17:45:57 -05:00

WebServerResources

Prevents 'make prod' from failing when auto-generated files do not change.

2016-02-15 10:18:34 -05:00

.gitignore

Add md-colors module

2015-06-11 15:57:19 -04:00

common.make

Put private libraries in /usr/lib/sogo

2014-10-01 20:36:42 +02:00

GNUmakefile

Fixed compilation ordering to avoid bug in gnustep-make

2013-07-23 08:31:38 -04:00