Merge remote-tracking branch 'origin/ignore-dust-utxo' into FOR-v1.1.… · bisq-network/bisq@ffde46a · GitHub

Commit

Merge remote-tracking branch 'origin/ignore-dust-utxo' into FOR-v1.1.…

Browse files

…-ignore-dust-utxo

# Conflicts:
#	core/src/main/java/bisq/core/user/PreferencesPayload.java
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java

Loading branch information

ManfredKarrer committed Apr 17, 2019

2 parents 0c02bbd + 99b79d0 commit ffde46a