Merge remote-tracking branch 'weblate/master'
authorHannu Nyman <hannu.nyman@iki.fi>
Fri, 1 May 2020 20:47:31 +0000 (23:47 +0300)
committerHannu Nyman <hannu.nyman@iki.fi>
Fri, 1 May 2020 20:47:31 +0000 (23:47 +0300)
commitf9a2f889ffb690770b6c8af7cc1a556cb2a99904
treed1e40b44776a27410bccb1fa51cc8a89a621088d
parentae13dcfefc6d9c1b47de75f9d671e7afb33dd298
parent5d66e288491e6353f8a2b33c5d4c8aa3cd3c6f74
Merge remote-tracking branch 'weblate/master'

Fix conflicts.

signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
applications/luci-app-simple-adblock/po/pl/simple-adblock.po
applications/luci-app-sqm/po/pl/sqm.po
applications/luci-app-vpn-policy-routing/po/pl/vpn-policy-routing.po
applications/luci-app-wol/po/de/wol.po
applications/luci-app-yggdrasil/po/de/yggdrasil.po