Merge branch 'beta' into mergemaster

# Conflicts: # src/main.cpp
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -17,7 +17,7 @@
 static const char *WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\"";

 /** Simple one-shot callback timer to be used by the RPC mechanism to e.g.
- * re-lock the wellet.
+ * re-lock the wallet.
 */
 class HTTPRPCTimer : public RPCTimerBase
 {