From: Hannu Nyman <redacted>
Date: Mon, 21 Apr 2025 19:11:19 +0000 (+0300)
Subject: treewide: Fix weblate conflicts
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=b0b22de5710343a467b0c696670b225e9bed0436;p=openwrt-luci.git

treewide: Fix weblate conflicts

Merge remote-tracking branch 'weblate/master' and fix conflicts.

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

b0b22de5710343a467b0c696670b225e9bed0436