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

Revert "Revert "Companion orml#786"" #2252

Merged
merged 1 commit into from
Jul 8, 2022

Conversation

xlc
Copy link
Member

@xlc xlc commented Jul 8, 2022

Reverts #2242

@xlc xlc merged commit 15cc74c into master Jul 8, 2022
@xlc xlc deleted the revert-2242-revert-2234-companion-orml-786 branch July 8, 2022 03:23
syan095 pushed a commit that referenced this pull request Jul 20, 2022
…e_distribution_liquidation

* origin/liquidation-improvement: (24 commits)
  Apply review suggestions.
  Use HonzonBridgeAccount instead of HonzonBridgePalletId (#2268)
  Support stable asset xtokens transfer (#2262)
  Update nightly-2022-05-15 (#2267)
  remove publication fee for acala (#2266)
  Custom aws runners (#2233)
  Mandala to compile runtime-benchmarks (#2211)
  Update srtool-build.sh (#2258)
  2.8.3 (#2255)
  Support transfer back statemint assets (#2241)
  Revert "Revert "Companion orml#786 (#2234)" (#2242)" (#2252)
  Add set_bridged_stable_coin_address (#2246)
  update docker images (#2248)
  Revert "Companion orml#786 (#2234)" (#2242)
  Update publish-release.yml (#2240)
  2.8.2 (#2236)
  Update predeploy-contracts to add MandalaAddress (#2235)
  Companion orml#786 (#2234)
  Enable honzon-bridge (#2227)
  patch stable asset (#2228)
  ...

# Conflicts:
#	modules/cdp-engine/src/lib.rs
#	runtime/acala/src/lib.rs
#	runtime/acala/src/xcm_config.rs
#	runtime/integration-tests/src/setup.rs
#	runtime/karura/src/lib.rs
#	runtime/karura/src/xcm_config.rs
#	runtime/mandala/src/xcm_config.rs
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

1 participant