Skip to content
This repository has been archived by the owner on Feb 3, 2024. It is now read-only.

To polkadot-v0.9.18 #68

Merged
merged 65 commits into from
May 30, 2022
Merged

To polkadot-v0.9.18 #68

merged 65 commits into from
May 30, 2022

Conversation

jiguantong
Copy link
Member

@jiguantong jiguantong commented May 16, 2022

aurexav and others added 30 commits May 10, 2022 18:37
# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	runtime/crab-parachain/Cargo.toml
#	runtime/darwinia-parachain/Cargo.toml
#	runtime/pangolin-parachain/Cargo.toml
…repare-polkadot-v0.9.17

# Conflicts:
#	runtime/crab-parachain/src/pallets/polkadot_xcm.rs
#	runtime/darwinia-parachain/src/pallets/polkadot_xcm.rs
#	runtime/pangolin-parachain/src/pallets/polkadot_xcm.rs
@jiguantong jiguantong requested review from aurexav and furoxr May 25, 2022 06:00
@jiguantong jiguantong marked this pull request as ready for review May 25, 2022 06:00
@aurexav
Copy link
Member

aurexav commented May 26, 2022

  1. Resolve the conflicts.
  2. Pick the darwinia-network/darwinia-messages-substrate@1b5398e to v0.9.18 and fix the benchmarking.

@jiguantong
Copy link
Member Author

  1. Resolve the conflicts.
  2. Pick the darwinia-network/darwinia-bridges-substrate@1b5398e to v0.9.18 and fix the benchmarking.

Done.

@aurexav aurexav merged commit 33707da into main May 30, 2022
@aurexav aurexav deleted the prepare-polkadot-v0.9.18 branch May 30, 2022 07:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants