Hannu Nyman 87d64ee279 treewide: fix conflicts with weblate ... Merge remote-tracking branch 'weblate/master' after fixing modules/luci-base/po/ja/base.po Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>		2020-11-22 17:59:52 +02:00
..
base.po	treewide: fix conflicts with weblate	2020-11-22 17:59:52 +02:00