Merge remote-tracking branch 'weblate/master'
authorHannu Nyman <hannu.nyman@iki.fi>
Thu, 23 Jan 2020 19:23:11 +0000 (21:23 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Thu, 23 Jan 2020 19:23:11 +0000 (21:23 +0200)
commit69dfaf222dd4895f58f37757baa29717a6745cd2
tree0c29e2c8d2cbc210ccfb347d750e885f31db244a
parentfdca2bfbe09a6df92178cce156d5132a56c29a42
parent9a7ea73ea0d55a6568bf05f62010f7cdcc65d2c9
Merge remote-tracking branch 'weblate/master'

Fix conflict at applications/luci-app-ddns/po/zh-tw/ddns.po

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
applications/luci-app-ddns/po/zh-tw/ddns.po
applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po
modules/luci-base/po/es/base.po