Merge dd01dc6a1d into merged_master (Bitcoin PR #21643)

This commit is contained in:
Andrew Poelstra 2021-06-29 23:27:21 +00:00
commit 0aa06dab4a

2
.gitignore vendored
View file

@ -149,3 +149,5 @@ db4/
osx_volname
dist/
*.background.tiff
/guix-build-*