danbjoseph f4b88dd3d0 resolve conflicts		2020-07-27 07:53:16 -04:00
..
en/pot	update language files	2020-07-21 20:57:31 -04:00
sw/LC_MESSAGES	resolve conflicts	2020-07-27 07:53:16 -04:00