Files
sogo/UI/PreferencesUI
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
..
2012-03-13 21:13:31 +00:00
2015-07-23 12:08:04 -04:00
2015-06-12 11:17:49 -04:00
2015-06-12 11:40:07 -04:00