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
..
main	Merge branch 'master' of github.com:bisq-network/bisq into redesign	2018-10-16 19:38:16 +02:00
test	Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign	2018-10-16 10:09:37 +02:00