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
Jack Grigg	6daab5b4fc	Only run wallet tests when wallet is enabled	2016-12-16 10:52:37 +13:00