Merge f0b457212f into merged_master (Bitcoin PR #21467)

This commit is contained in:
Andrew Poelstra 2021-06-30 02:27:50 +00:00
commit f2bd5dd18b
27 changed files with 179 additions and 150 deletions

View file

@ -13,7 +13,7 @@
#include <util/system.h>
#include <util/time.h>
#include <util/translation.h>
#include <wallet/external_signer.h>
#include <external_signer.h>
#include <wallet/scriptpubkeyman.h>
#include <optional>