Merge remote-tracking branch 'weblate/master' into wlfix
authorHannu Nyman <hannu.nyman@iki.fi>
Mon, 6 Jan 2020 09:39:01 +0000 (11:39 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Mon, 6 Jan 2020 09:39:01 +0000 (11:39 +0200)
commit55dcc8ab5c60334becd783e1c01f8de8ae3a9977
treeb9c0bf72cf0f35fdfc36c5e349177eae9aca4a4f
parent1cd0a4439bb132d095c8919e0016865b7210e7c0
parent488eccf319b515668333dedf912e80afda96f4f9
Merge remote-tracking branch 'weblate/master' into wlfix

Fixed one conflict.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
applications/luci-app-ddns/po/pl/ddns.po
applications/luci-app-mwan3/po/mr/mwan3.po
applications/luci-app-mwan3/po/pl/mwan3.po
applications/luci-app-statistics/po/pl/statistics.po
modules/luci-base/po/mr/base.po
modules/luci-base/po/pl/base.po