git.99rst.org
/
openwrt-luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d6cd72f
3297f2f
)
Merge remote-tracking branch 'weblate/master'
author
Hannu Nyman
<redacted>
Thu, 9 Feb 2023 21:30:37 +0000
(23:30 +0200)
committer
Hannu Nyman
<redacted>
Thu, 9 Feb 2023 21:30:37 +0000
(23:30 +0200)
Fix conflict.
Signed-off-by: Hannu Nyman <redacted>
1
2
applications/luci-app-sqm/po/tr/sqm.po
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
applications/luci-app-sqm/po/tr/sqm.po
Simple merge
git clone https://git.99rst.org/PROJECT