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://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
	
	修改是否十六进制选项选中值
This commit is contained in:
duandongmei
2018-08-24 19:47:32 +08:00
parent 7374c16da7 919c649e4e
commit 846985886f
24 changed files with 275 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1120,5 +1120,6 @@ certificate_subject=Certificate Subject
not_Before_Time=Certificate Start Time
not_After_Time=Certificate End Time
certificate_validity=Certificate Validity Period
end_entity=End-entity Certificate
header=Header
layer=Layer