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_zh_CN.properties
	增加file_digest_control=file digest control
This commit is contained in:
duandongmei
2018-06-07 09:49:28 +08:00
parent ae47170719 30c4dee595
commit 0a1e796382
13 changed files with 62 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -600,6 +600,6 @@ action_loop=\u56DE\u6D41
action_forward=\u8F6C\u53D1
action_ratelimit=\u9650\u901F
action_replace=\u66FF\u6362
action_whitelist=\u767D\u540D\u5355
action_whitelist=\u767D\u540D\u5355
action_monit=\u76D1\u6D4B
file_digest_control=\u6587\u4EF6\u6458\u8981\u7BA1\u63A7
file_digest_control=\u6587\u4EF6\u6458\u8981\u7BA1\u63A7