CORE-12165: resolve conflict on API version#1358

Merged

anien merged 2 commits intofeature/CORE-12165/key-rotationfrom dickon/feature-CORE-12165-merge-bump-version

Nov 21, 2023

Commits on Nov 21, 2023

CORE-17972: APIs for Send and Receive Transaction (#1346 )
jennyang-r3
authored
Merge remote-tracking branch 'origin/release/os/5.2' into feature/CORE-12165/key-rotation
dickon
committed