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-20 16:19:58 +08:00
parent 6aa6f253d4 203cf3355b
commit 224402956b
18 changed files with 2470 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1079,4 +1079,5 @@ domain_intercepter_ratelimit=Domain Intercept Ratelimit
app_built_in_features_config=APP Built-in Features
app_ssl_config=APP SSL Cert Feature
PXY_INTERCEPT_PKT_BIN=Intercept Messages
certificate=Certificate
certificate=Certificate
app_ssl_config=APP SSL Cert Feature

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

@@ -1077,4 +1077,4 @@ domain_intercepter_ratelimit=\u57DF\u540D\u62E6\u622A\u9650\u901F
app_built_in_features_config=APP\u5185\u7F6E\u7279\u5F81\u7EF4\u62A4
app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81
PXY_INTERCEPT_PKT_BIN=\u62E6\u622A\u62A5\u6587
certificate=\u8BC1\u4E66
certificate=\u8BC1\u4E66