git.99rst.org / openwrt-luci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96af12e 3894d39)
luci-app-mwan3: fix weblate conflict
authorHannu Nyman <redacted>
Sun, 8 Aug 2021 17:54:32 +0000 (20:54 +0300)
committerHannu Nyman <redacted>
Sun, 8 Aug 2021 17:54:32 +0000 (20:54 +0300)
Fix trivial "last modified date" conflict :-(
Merge remote-tracking branch 'weblate/master'

Signed-off-by: Hannu Nyman <redacted>

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