mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-16 13:01:19 +02:00
Merge f0c646f026 into merged_master (Bitcoin PR bitcoin/bitcoin#25730)
This merge was already done and resolved, but then I had to fix a previous commit. I then cherry-picked this resolved merge, did the outstanding PRs from the Elements side, confusing the merge ancestors and having to "redo" this merge - which just means this one is empty.
This commit is contained in:
commit
349f4d2778