projects
/
oweals
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fdca2bf
9a7ea73
)
Merge remote-tracking branch 'weblate/master'
author
Hannu Nyman
<hannu.nyman@iki.fi>
Thu, 23 Jan 2020 19:23:11 +0000
(21:23 +0200)
committer
Hannu Nyman
<hannu.nyman@iki.fi>
Thu, 23 Jan 2020 19:23:11 +0000
(21:23 +0200)
Fix conflict at applications/luci-app-ddns/po/zh-tw/ddns.po
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
1
2
applications/luci-app-ddns/po/zh-tw/ddns.po
patch
|
diff1
|
diff2
|
blob
|
history
applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po
patch
|
diff1
|
diff2
|
blob
|
history
modules/luci-base/po/es/base.po
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
applications/luci-app-ddns/po/zh-tw/ddns.po
Simple merge
diff --cc
applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po
Simple merge
diff --cc
modules/luci-base/po/es/base.po
Simple merge
projects / oweals / luci.git / commitdiff