Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

2018-08-07 13:52:48 +08:00
parent 66f1d115d5 3d6179bb3e
commit 4f1064c420
33 changed files with 110 additions and 262 deletions
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
@@ -51,6 +51,7 @@
 		ipv6: "ipv6",
 		over6: "4over6",
 		over4: "6over4",
+		ipv4v6:"Please enter a correct IPv4(0.0.0.0) or IPv6(::)",
 		all: "all",
 		ip_subnet: "Subnet",
 		ip_range: "ip Range",