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 src/main/resources/nis.properties 修复单个appHTTP界面cfgType多余问题 x509校验证书 字符串模板导出问题修复
This commit is contained in:
@@ -537,4 +537,4 @@ cert_file_path=/home/cert/
|
||||
#证书校验工具名称
|
||||
cert_validate_file=x509
|
||||
#证书校验成功的关键信息
|
||||
cert_validate_success_info=Successful
|
||||
cert_validate_success_info=Successful
|
||||
|
||||
Reference in New Issue
Block a user