Christoph Atteneder 0f7756267d Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.4 ... # 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-12-31 14:00:12 +01:00
..
package	Revert to SNAPSHOT version	2020-12-31 13:58:20 +01:00
src	Merge pull request #5011 from chimp1984/show-stacktrace-in-error-popup-at-view-exceptions	2020-12-29 19:58:01 +01:00