Anton Georgiev 952b4457f5 pull the latest German translations		2018-01-25 14:15:51 -05:00
..
config	Resolve merge conflict in english locales file	2018-01-19 17:43:11 -02:00
locales	pull the latest German translations	2018-01-25 14:15:51 -05:00