Christoph Atteneder 29c2e0002d Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.1 ... # Conflicts: # build.gradle # core/src/main/java/bisq/core/btc/setup/WalletConfig.java # desktop/package/linux/Dockerfile # desktop/package/linux/package.sh # desktop/package/linux/release.sh # desktop/package/macosx/create_app.sh # desktop/package/macosx/finalize.sh # desktop/package/macosx/insert_snapshot_version.sh # desktop/package/windows/package.bat # desktop/package/windows/release.bat # relay/src/main/resources/version.txt # seednode/src/main/java/bisq/seednode/SeedNodeMain.java		2020-12-08 22:19:11 +01:00
..
main/java/bisq/common	Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.1	2020-12-08 22:19:11 +01:00
test/java/bisq/common	Apply codacy suggestions	2020-10-08 18:23:04 -05:00