Christoph Atteneder 89073316c9 Merge branch 'master' of github.com:bisq-network/bisq into hotfix-v1.1.5 ... # 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		2019-08-08 11:19:51 +02:00
..
main	Bump version number	2019-08-08 09:54:54 +02:00
test/java/bisq/seednode	test all of it	2019-08-01 13:14:42 +02:00