public_service / public_sdk_newtools_res

Go to a project
Toggle navigation Toggle navigation pinning
xuguohong
80ae5a24 2 parents 8206dbd4 8d25c891

Merge branch 'master' of http://gitlab.9133.com:10080/public_service/public_sdk_newtools_res

Inline Side-by-side
Showing 1 changed file with 5 additions and 1 deletions
1 -{"version":"240522","url":"http://gitlab.9133.com:10080/public_service/public_sdk_newtools_res/raw/master/update.zip","msg":"修复添加插件时修改渠道配置bug"}
...\ No newline at end of file ...\ No newline at end of file
1 +<<<<<<< HEAD
2 +{"version":"240522","url":"http://gitlab.9133.com:10080/public_service/public_sdk_newtools_res/raw/master/update.zip","msg":"修复添加插件时修改渠道配置bug"}
3 +=======
4 +{"version":"231122_1","url":"http://gitlab.9133.com:10080/public_service/public_sdk_newtools_res/raw/master/update.zip","msg":"多语言UI优化，增加小工具"}
5 +>>>>>>> 8d25c89121ba1b12b7c79d767ee6be77dbc2069c
......