git.99rst.org / openwrt-luci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 258a301 a14b186)
treewide: Fix conflicts with remote 'weblate/master'
authorHannu Nyman <redacted>
Sat, 28 Feb 2026 17:57:55 +0000 (19:57 +0200)
committerHannu Nyman <redacted>
Sat, 28 Feb 2026 17:57:55 +0000 (19:57 +0200)
Merge a few changes and fix conflicts.
(stupid conflicts with .po metadata: last edit time & editor name)

Signed-off-by: Hannu Nyman <redacted>

Trivial merge
git clone https://git.99rst.org/PROJECT