Manfred Karrer 12e1124b6d Merge branch 'Development' into dao ... # Conflicts: # gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java		2017-11-30 23:33:49 -05:00
..
src	Merge branch 'Development' into dao	2017-11-30 23:33:49 -05:00
pom.xml	Set version 0.6.1. Add versions for seed and statistics nodes	2017-11-24 14:23:49 -05:00