Christoph Atteneder 29adc6b472 Merge branch 'master' of github.com:bisq-network/bisq into redesign ... # Conflicts: # core/src/main/resources/i18n/displayStrings.properties # desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java # desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java # desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java		2018-10-16 19:38:16 +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 into redesign	2018-10-16 19:38:16 +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