Merge master (0.90.1) into develop (1.0.0-b2):

The merge also updates the RELEASENOTES.md with the release
notes for the 0.90.1 which were accidentally not included
in that release.
This commit is contained in:
Nikolaos D. Bougalis
2018-03-23 16:21:35 -07:00
49 changed files with 437 additions and 283 deletions

View File

@@ -183,7 +183,7 @@ public:
using address_type = boost::asio::ip::address;
auto toStr = [](PublicKey const& publicKey) {
return toBase58(TokenType::TOKEN_NODE_PUBLIC, publicKey);
return toBase58(TokenType::NodePublic, publicKey);
};
// Publisher manifest/signing keys