Christoph Atteneder 788e0259d8 Merge branch 'release/v1.5.0' of github.com:bisq-network/bisq into add-delay-to-exit ... # Conflicts: # core/src/main/java/bisq/core/app/BisqExecutable.java		2020-11-24 09:23:16 +01:00
..
main	Merge branch 'release/v1.5.0' of github.com:bisq-network/bisq into add-delay-to-exit	2020-11-24 09:23:16 +01:00
test	Fix failing OpenOfferManagerTest & PeerManagerTest	2020-11-19 16:47:21 +01:00