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

This commit is contained in:
wangxin
2018-07-20 16:19:26 +08:00

View File

@@ -836,7 +836,7 @@ av_voip_account=voip Account Configuration
av_cont_ip=Content IP Configuration av_cont_ip=Content IP Configuration
NTC_SSL_SNI=SNI Keyowrd Configuration NTC_SSL_SNI=SNI Keyowrd Configuration
NTC_SSL_SAN=SAN Keyowrd Configuration NTC_SSL_SAN=SAN Keyowrd Configuration
NTC_SSL_CA=CN Keyowrd Configuration NTC_SSL_CN=CN Keyowrd Configuration
av_pic_ip=Picture IP Configuration av_pic_ip=Picture IP Configuration
av_cont_url=Content URL Configuration av_cont_url=Content URL Configuration
av_pic_url=Picture URL Configuration av_pic_url=Picture URL Configuration