Manfred Karrer 6939145045 Merge branch 'WIP' into DAO ... # Conflicts: # common/src/main/java/io/bisq/common/storage/FileManager.java		2017-05-15 14:13:19 +02:00
..
src	Merge branch 'WIP' into DAO	2017-05-15 14:13:19 +02:00
pom.xml	Add ScriptTypes: witness_v0_keyhash and witness_v0_scripthash. Use testnet genesis tx. Use version 0.5.8.1. of btcd rpc lib. Update docs	2017-04-22 01:02:18 -05:00