Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

2018-07-24 17:26:02 +08:00
parent b98b92c376 344f250b32
commit ea0b7a4df8
12 changed files with 1156 additions and 6 deletions
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -627,6 +627,8 @@ direct=direction
 stream_type=stream type
 clj_ip=processor ip
 nest_addr_list=nest addr list
+server_locate=server locate
+client_locate=client locate
 user_region=user region
 version=version
 encrypt_mode=encrypt mode