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

Chore/merge master to develop #930

Merged
merged 34 commits into from
Mar 14, 2024

Conversation

Alexey-N-Chernyshov
Copy link
Contributor

No description provided.

vovac12 and others added 30 commits September 26, 2023 23:45
…ra-xor/sora2-network into prepare-release-3.1.0
Signed-off-by: Mikhail Tagirov <dev.mikhail.tagirov@outlook.com>
Signed-off-by: Mikhail Tagirov <dev.mikhail.tagirov@outlook.com>
Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp>
fix
Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp>
fix
Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp>
Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp>
Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp>
Nikita Zaporozhets and others added 4 commits February 29, 2024 12:22
Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp>
Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp>
[DOPS-2942]: Update substrate build (master)
# Conflicts:
#	bridge-docker/docker-compose.evm.yml
#	housekeeping/build.sh
@Alexey-N-Chernyshov
Copy link
Contributor Author

@vovac12 do I need squash and merge or create a merge commit?

@Alexey-N-Chernyshov Alexey-N-Chernyshov merged commit 0c66d68 into develop Mar 14, 2024
6 checks passed
@Alexey-N-Chernyshov Alexey-N-Chernyshov deleted the chore/merge-master-to-develop branch March 14, 2024 12:01
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.

None yet

4 participants