Commit Graph

2 Commits

Author SHA1 Message Date
jl777
e73b2055c6 Merge branch 'beta' into mergemaster
# Conflicts:
#	src/main.cpp
2018-04-16 10:16:01 +03:00
Jonas Schnelli
2ab237a088 add RPC tests for setban & disconnectnode 2017-03-02 13:23:03 -08:00