Merge remote-tracking branch 'origin/avoid-taker-fee-publishing-for-f… · bisq-network/bisq@46d15dc · GitHub

Commit

Merge remote-tracking branch 'origin/avoid-taker-fee-publishing-for-f…

Browse files

…ailed-trades' into avoid-taker-fee-publishing-for-failed-trades

# Conflicts:
#	core/src/main/java/bisq/core/trade/protocol/tasks/taker/TakerPublishFeeTx.java

Loading branch information

ManfredKarrer committed Mar 4, 2019

2 parents ba376fe + db4c6f5 commit 46d15dc