Mike Rosseel f99a3c1238 Merge branch 'DAO' into altcoins ... Conflicts: common/src/main/java/io/bisq/common/proto/ProtoUtil.java core/src/main/java/io/bisq/core/user/Preferences.java		2017-06-09 16:58:06 +02:00
..
src	Merge branch 'DAO' into altcoins	2017-06-09 16:58:06 +02:00
pom.xml	Adjust code to work with BitcoinJ 0.14.4.1	2017-04-21 15:20:32 -05:00