Skip to content

Commit

Permalink
Merge branch 'pallet-xcm-fully-support-reserve-transfers' into update…
Browse files Browse the repository at this point in the history
…-from-adrian

# Conflicts:
#	Cargo.lock
#	cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml
#	cumulus/parachains/integration-tests/emulated/common/src/lib.rs
#	cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/snowbridge.rs
  • Loading branch information
claravanstaden authored and claravanstaden committed Nov 10, 2023
2 parents 06dd2f9 + c5522e4 commit 655ecdf
Show file tree
Hide file tree
Showing 94 changed files with 3,088 additions and 3,537 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
**/._*
**/.criterion/
**/*.rs.bk
**/chains/
**/hfuzz_target/
**/hfuzz_workspace/
**/node_modules
Expand Down
Loading

0 comments on commit 655ecdf

Please sign in to comment.