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 15:39:21 +08:00
parent e53f714848 0546a0c93c
commit b134786c70
74 changed files with 5494 additions and 1002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1105,4 +1105,4 @@ pxy_intercept_monit_keyring=\u8BC1\u4E66\u7B56\u7565
intercept_file_strategy=\u62E6\u622A\u8BC1\u4E66\u7B56\u7565
root=\u6839\u8BC1\u4E66
intermediate=\u4E2D\u95F4\u8BC1\u4E66
end_entity=\u5B9E\u4F53\u8BC1\u4E66
end_entity=\u5B9E\u4F53\u8BC1\u4E66