Files
sogo/UI/Templates
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
..
2015-07-31 14:14:30 -04:00
2010-08-03 15:13:58 +00:00
2013-12-10 20:09:32 -05:00