LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
sogo/UI/AdministrationUI/English.lproj
History
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
..
Localizable.strings Merge branch 'master' into feature/addMissingStrings2 2015-12-03 11:16:17 -05:00