mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-21 22:30:57 +00:00
Conflict resolution: - features.macro: kept fixCleanup3_4_0 from develop and kept SmartEscrow at Supported::Yes, which is the only thing this branch changes.