Christoph Atteneder 11b0a466ce Merge branch 'master' of github.com:bisq-network/bisq into release/v1.5.0 ... # Conflicts: # core/src/main/java/bisq/core/provider/fee/FeeService.java # core/src/main/resources/i18n/displayStrings.properties # seednode/src/main/java/bisq/seednode/SeedNodeMain.java		2020-11-25 14:05:37 +01:00
..
main	Merge branch 'master' of github.com:bisq-network/bisq into release/v1.5.0	2020-11-25 14:05:37 +01:00
test	Fix failing OpenOfferManagerTest & PeerManagerTest	2020-11-19 16:47:21 +01:00