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-09-19 18:16:47 +08:00
parent 5315f297c6 ba76abb88b
commit 9bec3da807
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1166,4 +1166,6 @@ mm_face_recognization_reject=Face Recognization Reject
app_topic_domain_monit=Topic Website Momotoring
ASN_POLICY_REJECT=ASN Policy Control
ASN_POLICY_MONIT=ASN Policy Monitoring
p2p_monit=P2P Monitoring
p2p_monit=P2P Monitoring
av_content_url_whitelist=Multimedia Content Url White List
av_content_ip_whitelist=Multimedia Content IP White List