Hannu Nyman 55dcc8ab5c Merge remote-tracking branch 'weblate/master' into wlfix ... Fixed one conflict. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>		2020-01-06 11:39:01 +02:00
..
base.po	Merge remote-tracking branch 'weblate/master' into wlfix	2020-01-06 11:39:01 +02:00