gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

Browse Source 
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:
duandongmei
2018-10-20 13:46:41 +08:00
parent 8abadf0ccb cce50a3a43
commit aaf7942222
40 changed files with 1333 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/messages/message_en.properties
View File

@@ -1264,7 +1264,10 @@ ip_range_in_c=Start IP and end IP in a IP range must with in C subnet
ip_range_bit_field=Start IP and end IP in a IP range has the same network number bit field
ip_range_smaller=Start IP in a IP range should smaller than end IP
alternative_values= Alternative values can be %s
<<<<<<< HEAD
certificate_error=Wrong format of public key file and private key file
public_file_error=Wrong format of public key file
private_file_error=Wrong format of private key file
=======
>>>>>>> branch 'develop' of http://192.168.10.125/k18_web/NFS.git
keyframe_pic_required=No keyframe pictures have been selected.