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

..

AdministrationUI

Merge branch 'master' into feature/addMissingStrings2

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

Common

Merge branch 'master' into feature/addMissingStrings2

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

Contacts

Merge branch 'master' into feature/addMissingStrings2

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

MailerUI

Merge branch 'master' into feature/addMissingStrings2

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

MailPartViewers

Merge branch 'master' into feature/addMissingStrings2

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

MainUI

Merge branch 'master' into feature/addMissingStrings2

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

PreferencesUI

Merge branch 'master' into feature/addMissingStrings2

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

Scheduler

Merge branch 'master' into feature/addMissingStrings2

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

SOGoElements

Load XMLHttpRequest conditionally (< IE9)

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

SOGoUI

Stage 1 of clang compiler warning patches.

2015-10-31 14:10:03 +08:00

Templates

Merge branch 'master' into feature/addMissingStrings2

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

WebServerResources

(js) Restore dot search in Contacts module

2015-12-02 16:43:06 -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