treewide: fix weblate conflicts
authorHannu Nyman <hannu.nyman@iki.fi>
Tue, 29 Dec 2020 11:29:41 +0000 (13:29 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Tue, 29 Dec 2020 11:29:41 +0000 (13:29 +0200)
commit91a6006bde3611f57fc8fa21d148cfc487e6eb56
tree36e75ff5bd4ae3deed7a4bbbf00b95f4e74d451a
parent068755e6033560df11d853e5b2a104bfb95da8ea
parent03849e55d2a02dc5a1de0dcd99c70047280f14d0
treewide: fix weblate conflicts

Merge remore tracking branch 'weblate/master' and
fix conflicts.
applications/luci-app-statistics/po/zh_Hant/statistics.po
modules/luci-base/po/zh_Hant/base.po