Christoph Atteneder 4b826eb2a9 Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.1 ... # 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-04-08 23:03:19 +02:00
..
Dockerfile	Revert to SNAPSHOT version	2020-04-08 22:59:10 +02:00
icon.png	Remove 32bit versions and update for Java 9+ support	2018-12-03 16:48:53 +01:00
LICENSE	Move desktop to subdirectory	2018-09-05 09:50:29 +02:00
package.sh	Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.1	2020-04-08 23:03:19 +02:00
release.sh	Revert to SNAPSHOT version	2020-04-08 22:59:10 +02:00