Merge 99813a9745 into merged_master (Bitcoin PR #17829)

This commit is contained in:
Andrew Poelstra 2020-11-14 16:52:02 +00:00
commit 009bc2fdfb
339 changed files with 339 additions and 339 deletions

View file

@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2018 The Bitcoin Core developers
// Copyright (c) 2009-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.