Merge branch 'dev' into sietch

Conflicts: src/coins.cpp
2019-12-28 17:39:47 -05:00
parent 773719b66c 172ac60765
commit 83c7586e40
411 changed files with 7593 additions and 69011 deletions
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -1,5 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2019-2020 The Hush developers
+
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.