sowle
46a0db21ec
Merge branch 'develop' into cryptoassets
# Conflicts:
# CMakeLists.txt
# README.md
# contrib/epee/include/net/http_client.h
# src/currency_core/blockchain_storage.cpp
# src/currency_core/currency_core.cpp
# src/currency_core/currency_format_utils.cpp
# src/gui/qt-daemon/layout
# src/rpc/core_rpc_server.cpp
# src/rpc/core_rpc_server.h
# src/rpc/core_rpc_server_commands_defs.h
# src/version.h.in
# src/wallet/wallet2.cpp
# src/wallet/wallet2.h
# src/wallet/wallet_public_structs_defs.h
# src/wallet/wallet_rpc_server.h
# tests/core_tests/chaingen.cpp
# tests/core_tests/pos_validation.cpp
# tests/core_tests/wallet_tests.cpp
# tests/performance_tests/main.cpp