From: Hannu Nyman Date: Thu, 23 Jan 2020 19:23:11 +0000 (+0200) Subject: Merge remote-tracking branch 'weblate/master' X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=69dfaf222dd4895f58f37757baa29717a6745cd2;p=oweals%2Fluci.git Merge remote-tracking branch 'weblate/master' Fix conflict at applications/luci-app-ddns/po/zh-tw/ddns.po Signed-off-by: Hannu Nyman --- 69dfaf222dd4895f58f37757baa29717a6745cd2