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://192.168.10.125/k18_web/NFS.git into

Browse Source 
develop

Conflicts:
	src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
This commit is contained in:
DuanDongmei
2018-11-29 10:07:56 +08:00
parent 17422bfb93 a99fe7e835
commit ece3141152
81 changed files with 1322 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1334,4 +1334,5 @@ incoming_broadcast_total_size=Incoming Broadcast Total Size
address_pool=Address Pool
ip_total=IP Total
available_ip_total=Available IP Total
address_pool_id=Address Pool ID
address_pool_id=Address Pool ID
log_to_cfg=Config

3
src/main/resources/messages/message_ru.properties
View File

@@ -1334,4 +1334,5 @@ incoming_broadcast_total_size=Incoming Broadcast Total Size
address_pool=Address Pool
ip_total=IP Total
available_ip_total=Available IP Total
address_pool_id=Address Pool ID
address_pool_id=Address Pool ID
log_to_cfg=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F