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_ru.properties
	src/main/resources/messages/message_zh_CN.properties
策略分组功能提交
This commit is contained in:
duandongmei
2018-06-20 13:37:07 +08:00
parent c4388a6351 e21380a7f1
commit 20e38eb0e8
38 changed files with 2957 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -658,10 +658,14 @@ data_tunnel=data tunnel
contrl_message=contrl message
data_message=data message
user_name=user name
<<<<<<< HEAD
#===========log end =============
#===========policy_group_manage start =============
all_types=all types
group_type=group type
group_name=group name
policy_group_manage=strateagy grouping management
#===========policy_group_manage end =============
#===========policy_group_manage end =============
=======
#===========log end =============
>>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git