Manfred Karrer 80066bda8c Merge branch 'release-candidate-0.9.0' into sqrrm-bonded-reputation ... # Conflicts: # desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingViewUtils.java		2018-10-31 13:51:15 -05:00
..
.tx	Merge core repository at 4597613	2018-09-05 10:48:22 +02:00
src	Merge branch 'release-candidate-0.9.0' into sqrrm-bonded-reputation	2018-10-31 13:51:15 -05:00
build.gradle	Move javafx dependencies to common	2018-10-22 16:01:02 -05:00
update_translations.sh	Merge core repository at 4597613	2018-09-05 10:48:22 +02:00