Merge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes

diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_aiccu.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_aiccu.lua
index e3ae020..5a971ce 100644 (file)
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_aiccu.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_aiccu.lua
@@ -76,7 +76,7 @@ requiretls = section:taboption("general", Flag, "requiretls",
        translate("Require TLS"),
        translate("Connection to server fails when TLS cannot be used"))
 requiretls.optional = true
-requiretls.default = requiretls.enabled
+requiretls.default = enabled
 
 
 verbose = section:taboption("advanced", Flag, "verbose",