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/java/bisq/common	Merge branch 'master' of github.com:bisq-network/bisq into release/v1.5.0	2020-11-25 14:05:37 +01:00
test/java/bisq/common	Apply codacy suggestions	2020-10-08 18:23:04 -05:00