Christoph Atteneder bdf6463e61 Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.8 ... # 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		2021-03-02 10:06:49 +01:00
..
package	Revert to SNAPSHOT version	2021-03-02 10:03:29 +01:00
src	Update Preferences tests to new constructor signature	2021-03-01 11:24:56 +01:00