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/java/com/nis/web/controller/BaseController.java
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
This commit is contained in:
duandongmei
2018-08-21 13:31:21 +08:00
parent b1a2eae606 d52178a510
commit d6a2b98ec9
26 changed files with 1370 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1082,7 +1082,7 @@ PXY_INTERCEPT_PKT_BIN=Intercept Messages
certificate=Certificate
app_ssl_config=APP SSL Cert Feature
call_external_procedures_failed=Call external procedures failedfile_strategy=\u6587\u4EF6\u7B56\u7565
call_external_procedures_failed=Call external procedures failed
file_strategy=File Strategy
file_desc=File Desc
content_type=Content Type