Christoph Atteneder 81df879881 Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.9 ... # Conflicts: # build.gradle # 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		2020-09-16 16:52:54 +02:00
..
src	Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.9	2020-09-16 16:52:54 +02:00