bisq/desktop/package
Christoph Atteneder 4201e065bc
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.1.6
# 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
2019-09-23 10:57:03 +02:00
..
linux Revert to SNAPSHOT version 2019-09-23 10:55:08 +02:00
macosx Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.1.6 2019-09-23 10:57:03 +02:00
windows Revert to SNAPSHOT version 2019-09-23 10:55:08 +02:00
5BC5ED73.asc Move desktop to subdirectory 2018-09-05 09:50:29 +02:00
29CDFD3B.asc Move desktop to subdirectory 2018-09-05 09:50:29 +02:00
F379A1C6.asc Move desktop to subdirectory 2018-09-05 09:50:29 +02:00
signingkey.asc Move desktop to subdirectory 2018-09-05 09:50:29 +02:00
tools-1.0.jar Update linux packaging process 2019-01-03 00:33:00 -08:00