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
..
Bisq.iconset	Add custom background image, icon and positioning for dmg bundle	2018-09-28 12:05:06 +02:00
Bisq-background.png	Combine and update installer background	2019-02-26 15:43:29 +01:00
Bisq-dmg-setup.scpt	Add custom background image, icon and positioning for dmg bundle	2018-09-28 12:05:06 +02:00
Bisq.icns	Add custom background image, icon and positioning for dmg bundle	2018-09-28 12:05:06 +02:00
copy_dbs.sh	Update data stores	2019-09-02 11:14:59 +02:00
create_app.sh	Revert to SNAPSHOT version	2019-09-23 10:55:08 +02:00
create_desktop_for_testing.sh	Add scripts to create testing jars	2019-09-04 13:53:09 +02:00
create_seednode_for_testing.sh	Add scripts to create testing jars	2019-09-04 13:53:09 +02:00
finalize.sh	Revert to SNAPSHOT version	2019-09-23 10:55:08 +02:00
Info.plist	Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.1.6	2019-09-23 10:57:03 +02:00
insert_snapshot_version.sh	Revert to SNAPSHOT version	2019-09-23 10:55:08 +02:00
replace_version_number.sh	Bump version number	2019-09-23 10:10:09 +02:00