chimp1984 fb41a1984b Merge branch 'master_upstream' into fix-delayed-payout-tx-issues ... # Conflicts: # core/src/main/java/bisq/core/trade/TradeManager.java # desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java		2020-10-01 09:24:46 -05:00
..
main	Merge branch 'master_upstream' into fix-delayed-payout-tx-issues	2020-10-01 09:24:46 -05:00
test	bitcoinj 0.15: Futures.addCallback() in guava 28 requires an executor.	2020-09-18 18:29:27 -03:00