Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into release/1.3.1-runtime
# Conflicts: # Cargo.lock # Cargo.toml # chain-spec-generator/src/common.rs # chain-spec-generator/src/main.rs # integration-tests/emulated/chains/parachains/bridges/bridge-hub-paseo/src/genesis.rs # integration-tests/emulated/chains/relays/paseo/src/genesis.rs # integration-tests/emulated/networks/paseo-system/src/lib.rs # integration-tests/emulated/tests/bridges/bridge-hub-paseo/src/lib.rs # integration-tests/emulated/tests/bridges/bridge-hub-paseo/src/tests/snowbridge.rs # relay/paseo/Cargo.toml # relay/paseo/src/impls.rs # relay/paseo/src/lib.rs # system-parachains/asset-hub-paseo/src/lib.rs # system-parachains/asset-hub-paseo/src/weights/cumulus_pallet_parachain_system.rs # system-parachains/asset-hub-paseo/src/weights/cumulus_pallet_xcmp_queue.rs # system-parachains/asset-hub-paseo/src/weights/frame_system.rs # system-parachains/asset-hub-paseo/src/weights/pallet_asset_conversion.rs # system-parachains/asset-hub-paseo/src/weights/pallet_assets_foreign.rs # system-parachains/asset-hub-paseo/src/weights/pallet_assets_local.rs # system-parachains/asset-hub-paseo/src/weights/pallet_assets_pool.rs # system-parachains/asset-hub-paseo/src/weights/pallet_balances.rs # system-parachains/asset-hub-paseo/src/weights/pallet_collator_selection.rs # system-parachains/asset-hub-paseo/src/weights/pallet_message_queue.rs # system-parachains/asset-hub-paseo/src/weights/pallet_multisig.rs # system-parachains/asset-hub-paseo/src/weights/pallet_nfts.rs # system-parachains/asset-hub-paseo/src/weights/pallet_proxy.rs # system-parachains/asset-hub-paseo/src/weights/pallet_session.rs # system-parachains/asset-hub-paseo/src/weights/pallet_timestamp.rs # system-parachains/asset-hub-paseo/src/weights/pallet_uniques.rs # system-parachains/asset-hub-paseo/src/weights/pallet_utility.rs # system-parachains/asset-hub-paseo/src/weights/pallet_xcm.rs # system-parachains/asset-hub-paseo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs # system-parachains/asset-hub-paseo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs # system-parachains/asset-hub-paseo/tests/weight_trader.rs # system-parachains/bridge-hub-paseo/Cargo.toml # system-parachains/bridge-hub-paseo/build.rs # system-parachains/bridge-hub-paseo/primitives/src/lib.rs # system-parachains/bridge-hub-paseo/src/bridge_to_kusama_config.rs # system-parachains/bridge-hub-paseo/src/lib.rs # system-parachains/bridge-hub-paseo/src/weights/cumulus_pallet_parachain_system.rs # system-parachains/bridge-hub-paseo/src/weights/cumulus_pallet_xcmp_queue.rs # system-parachains/bridge-hub-paseo/src/weights/frame_system.rs # system-parachains/bridge-hub-paseo/src/weights/mod.rs # system-parachains/bridge-hub-paseo/src/weights/pallet_balances.rs # system-parachains/bridge-hub-paseo/src/weights/pallet_bridge_grandpa.rs # system-parachains/bridge-hub-paseo/src/weights/pallet_bridge_messages.rs # system-parachains/bridge-hub-paseo/src/weights/pallet_bridge_parachains.rs # system-parachains/bridge-hub-paseo/src/weights/pallet_bridge_relayers.rs # system-parachains/bridge-hub-paseo/src/weights/pallet_collator_selection.rs # system-parachains/bridge-hub-paseo/src/weights/pallet_message_queue.rs # system-parachains/bridge-hub-paseo/src/weights/pallet_multisig.rs # system-parachains/bridge-hub-paseo/src/weights/pallet_session.rs # system-parachains/bridge-hub-paseo/src/weights/pallet_timestamp.rs # system-parachains/bridge-hub-paseo/src/weights/pallet_utility.rs # system-parachains/bridge-hub-paseo/src/weights/pallet_xcm.rs # system-parachains/bridge-hub-paseo/src/weights/snowbridge_pallet_ethereum_client.rs # system-parachains/bridge-hub-paseo/src/weights/snowbridge_pallet_inbound_queue.rs # system-parachains/bridge-hub-paseo/src/weights/snowbridge_pallet_outbound_queue.rs # system-parachains/bridge-hub-paseo/src/weights/snowbridge_pallet_system.rs # system-parachains/bridge-hub-paseo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs # system-parachains/bridge-hub-paseo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs # system-parachains/bridge-hub-paseo/src/xcm_config.rs # system-parachains/bridge-hub-paseo/tests/snowbridge.rs # system-parachains/bridge-hub-paseo/tests/tests.rs # system-parachains/people-paseo/src/weights/cumulus_pallet_parachain_system.rs # system-parachains/people-paseo/src/weights/cumulus_pallet_xcmp_queue.rs # system-parachains/people-paseo/src/weights/frame_system.rs # system-parachains/people-paseo/src/weights/pallet_balances.rs # system-parachains/people-paseo/src/weights/pallet_collator_selection.rs # system-parachains/people-paseo/src/weights/pallet_identity.rs # system-parachains/people-paseo/src/weights/pallet_message_queue.rs # system-parachains/people-paseo/src/weights/pallet_multisig.rs # system-parachains/people-paseo/src/weights/pallet_proxy.rs # system-parachains/people-paseo/src/weights/pallet_session.rs # system-parachains/people-paseo/src/weights/pallet_timestamp.rs # system-parachains/people-paseo/src/weights/pallet_utility.rs # system-parachains/people-paseo/src/weights/pallet_xcm.rs # system-parachains/people-paseo/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs # system-parachains/people-paseo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
- Loading branch information