Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into
develop Conflicts: src/main/resources/messages/message_en.properties src/main/resources/messages/message_ru.properties src/main/resources/messages/message_zh_CN.properties 拦截域名增加拦截强度
This commit is contained in:
@@ -1248,4 +1248,4 @@ ipsec_protocol=IPSEC Protocol
|
||||
intercept_intensity=Intercept Intensity
|
||||
weak_intensity=Weak
|
||||
stronger_intensity=Strong
|
||||
strong_intensity=Stronger
|
||||
strong_intensity=Stronger
|
||||
|
||||
Reference in New Issue
Block a user