Christoph Atteneder ef5ff1249b Merge branch 'master' of github.com:bisq-network/bisq into release/v1.7.1 ... # Conflicts: # build.gradle # desktop/package/linux/Dockerfile # desktop/package/macosx/finalize.sh # desktop/package/macosx/insert_snapshot_version.sh # relay/src/main/resources/version.txt		2021-07-16 13:02:18 +02:00
..
package	Revert to SNAPSHOT version	2021-07-16 12:58:55 +02:00
src	Merge pull request #5621 from ripcurlx/add-payment-account-payload-safeguards	2021-07-13 10:24:49 +02:00