diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2017-04-17 20:29:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 20:29:11 +0300 |
| commit | 91c0b91a2e1903ee697c214ff7d8fffac559c424 (patch) | |
| tree | d4bd25e3476682bfada61f31a5f07e161099b0f9 /applications | |
| parent | 76ee1ba85204257c9c51ffb5bf71a75c4a511165 (diff) | |
| parent | b234897789bae2635ec12452722d9f0818479b4c (diff) | |
Merge pull request #1115 from dibdot/app-adblock
luci-app-adblock: sync with 2.6.0-2
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/luci-app-adblock/Makefile | 2 | ||||
| -rw-r--r-- | applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile index cc07bbffc..ae1eba251 100644 --- a/applications/luci-app-adblock/Makefile +++ b/applications/luci-app-adblock/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for Adblock -LUCI_DEPENDS:=+adblock +LUCI_DEPENDS:=+adblock +luci-lib-jsonc LUCI_PKGARCH:=all include ../../luci.mk diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua index 362ae79bf..fbc09b184 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua @@ -50,7 +50,7 @@ o2.rmempty = true o3 = s:option(Value, "adb_triggerdelay", translate("Trigger delay"), translate("Additional trigger delay in seconds before adblock processing begins.")) -o3.default = 1 +o3.default = 2 o3.datatype = "range(1,90)" o3.rmempty = false |