Christoph Atteneder be70eb1b83 Merge branch 'master' of github.com:bisq-network/bisq into rpm-package ... # Conflicts: # desktop/package/linux/package.sh		2019-01-14 15:06:07 +01:00
..
Dockerfile	Set back to SNAPSHOT	2019-01-08 19:56:23 +01: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 rpm-package	2019-01-14 15:06:07 +01:00
release.sh	Merge branch 'master' of https://github.com/bisq-network/bisq into rpm-package	2019-01-11 11:36:23 -08:00