From: Hannu Nyman <redacted>
Date: Wed, 21 Jun 2023 14:44:25 +0000 (+0300)
Subject: treewide: fix weblate conflicts
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=3b9adf800f6d93ec639577fc1f93ad841f841f1f;p=openwrt-luci.git

treewide: fix weblate conflicts

Merge remote-tracking branch 'weblate/master'

Signed-off-by: Hannu Nyman <redacted>
---

3b9adf800f6d93ec639577fc1f93ad841f841f1f