Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into rc/v1.6 #389

Merged
merged 63 commits into from
Jul 5, 2023
Merged

Merge master into rc/v1.6 #389

merged 63 commits into from
Jul 5, 2023

Conversation

bogdan-rosianu
Copy link
Contributor

No description provided.

AdoAdoAdo and others added 30 commits August 16, 2022 16:23
# Conflicts:
#	data/transaction.go
#	go.mod
#	go.sum
# Conflicts:
#	api/mock/facade.go
#	go.mod
#	go.sum
# Conflicts:
#	api/mock/facadeStub.go
#	facade/baseFacade_test.go
#	facade/interface.go
#	facade/mock/accountProccessorStub.go
#	faucet/privateKeysLoader.go
#	go.mod
#	go.sum
#	process/faucetProcessor_test.go
iulianpascalau and others added 24 commits April 5, 2023 14:55
…c-v1.5.0-2023.04.05

Update feat freeze accounts rc v1.5.0 2023.04.05
# Conflicts:
#	api/groups/baseAccountsGroup.go
#	api/groups/interface.go
#	api/mock/facadeStub.go
#	cmd/proxy/config/apiConfig/v1_0.toml
#	cmd/proxy/config/apiConfig/v_next.toml
#	facade/interface.go
#	facade/mock/accountProccessorStub.go
#	go.sum
@bogdan-rosianu bogdan-rosianu self-assigned this Jul 5, 2023
@bogdan-rosianu bogdan-rosianu merged commit dd0b54b into rc/v1.6.0 Jul 5, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants