Christoph Atteneder 0edbb1733c Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign ... # Conflicts: # desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java # desktop/src/main/java/bisq/desktop/util/FormBuilder.java		2018-10-16 10:09:37 +02:00
..
.tx	Merge core repository at 4597613	2018-09-05 10:48:22 +02:00
src	Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign	2018-10-16 10:09:37 +02:00
build.gradle	Change btcd-cli4j to 3864e1c4	2018-10-01 12:17:40 -05:00
update_translations.sh	Merge core repository at 4597613	2018-09-05 10:48:22 +02:00