Christoph Atteneder 4104fcd67f Merge branch 'master' of github.com:bisq-network/bisq into release/v1.6.4 ... # Conflicts: # build.gradle # desktop/package/linux/Dockerfile # desktop/package/macosx/insert_snapshot_version.sh # relay/src/main/resources/version.txt		2021-05-07 10:47:05 +02:00
..
package	Fix wrong resource path for Raspberry Pi bundle	2021-05-06 20:40:20 +02:00
src	Merge branch 'master' of github.com:bisq-network/bisq into release/v1.6.3	2021-05-07 10:33:45 +02:00