OSDN Git Service
(root)
/
immortalwrt
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
91fbe48
904c174
)
Merge Official Source
author
ZiMing Mo
<msylgj@immortalwrt.org>
Thu, 28 Apr 2022 15:00:51 +0000
(23:00 +0800)
committer
ZiMing Mo
<msylgj@immortalwrt.org>
Thu, 28 Apr 2022 15:01:06 +0000
(23:01 +0800)
Signed-off-by: ZiMing Mo <msylgj@immortalwrt.org>
1
2
luci.mk
patch
|
diff1
|
diff2
|
blob
|
history
modules/luci-base/po/zh_Hans/base.po
patch
|
diff1
|
diff2
|
blob
|
history
modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
luci.mk
Simple merge
diff --cc
modules/luci-base/po/zh_Hans/base.po
Simple merge
diff --cc
modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json
Simple merge