gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,069 Commits 14 Branches 0 Tags
051d16bfc9e2eb694c84c2a34dab5759d3e204f3
Commit Graph

1 Commits

Author SHA1 Message Date
duandongmei
aaf7942222 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校验证书
字符串模板导出问题修复
 2018-10-20 13:46:41 +08:00