Merge branch 'master' of github.com:HuobiRDCenter/huobi_Cpp · HuobiRDCenter/huobi_Cpp@28ca7f7 · GitHub

Commit

Merge branch 'master' of github.com:HuobiRDCenter/huobi_Cpp

Browse files

# Conflicts:
#	include/client/subUserClient.h
#	include/client/walletClient.h
#	include/include.h
#	src/client/subUserClient.cpp
#	src/client/walletClient.cpp

Loading branch information

yuanxueqi committed Oct 10, 2020

2 parents 5c1965a + 273ba58 commit 28ca7f7