projects
/
oweals
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7a010b1
29aad47
)
Merge pull request #3145 from ptpt52/refine-flash-reset
author
Jo-Philipp Wich
<jo@mein.io>
Wed, 16 Oct 2019 19:31:26 +0000
(21:31 +0200)
committer
GitHub
<noreply@github.com>
Wed, 16 Oct 2019 19:31:26 +0000
(21:31 +0200)
luci-mod-system: refine flash reset
1
2
modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json
patch
|
diff1
|
diff2
|
blob
|
history
modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json
Simple merge
diff --cc
modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
Simple merge