Merge master (1.7.2) into develop (1.8.0-b2)

This commit is contained in:
manojsdoshi
2021-05-26 14:05:55 -07:00
16 changed files with 595 additions and 90 deletions

View File

@@ -116,6 +116,7 @@ class FeatureCollections
"TicketBatch",
"FlowSortStrands",
"fixSTAmountCanonicalize",
"fixRmSmallIncreasedQOffers",
};
std::vector<uint256> features;
@@ -376,6 +377,7 @@ extern uint256 const featureNegativeUNL;
extern uint256 const featureTicketBatch;
extern uint256 const featureFlowSortStrands;
extern uint256 const fixSTAmountCanonicalize;
extern uint256 const fixRmSmallIncreasedQOffers;
} // namespace ripple