Merge remote-tracking branch 'origin/testnet' into testnet · LimeChain/hashport-validator@b4fe68f · GitHub

Commit

Merge remote-tracking branch 'origin/testnet' into testnet

Browse files

# Conflicts:
#	app/services/assets/assets.go
#	e2e/setup/config.go
#	scripts/bridge/setup/extend-config/cmd/extend-bridge-config.go
#	scripts/bridge/setup/from-config/cmd/setup-from-config.go
#	scripts/bridge/setup/setup.go
#	scripts/token/associate/associate.go

Loading branch information

svetlio8 committed Sep 11, 2022

2 parents 0b93e4a + 2527d28 commit b4fe68f